diff --git a/src/raspberrypi/devices/scsi_host_bridge.cpp b/src/raspberrypi/devices/scsi_host_bridge.cpp
index ba69aa57..02f498ef 100644
--- a/src/raspberrypi/devices/scsi_host_bridge.cpp
+++ b/src/raspberrypi/devices/scsi_host_bridge.cpp
@@ -318,9 +318,7 @@ void SCSIBR::Read10(SASIDEV *controller)
 		ctrl->buffer = (BYTE *)malloc(ctrl->bufsize);
 	}
 
-	// TODO Move code to subclass
-	ctrl->length = ((SCSIBR*)ctrl->device)->GetMessage10(ctrl->cmd, ctrl->buffer);
-
+	ctrl->length = GetMessage10(ctrl->cmd, ctrl->buffer);
 	if (ctrl->length <= 0) {
 		// Failure (Error)
 		controller->Error();