diff --git a/Bootloaders/MassStorage/Lib/SCSI.c b/Bootloaders/MassStorage/Lib/SCSI.c
index b23a5a07b1..eeb2c252a2 100644
--- a/Bootloaders/MassStorage/Lib/SCSI.c
+++ b/Bootloaders/MassStorage/Lib/SCSI.c
@@ -255,14 +255,12 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
 	}
 
 	/* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */
-	while (TotalBlocks--)
+	for (uint16_t i = 0; i < TotalBlocks; i++)
 	{
 		if (IsDataRead == DATA_READ)
-		  VirtualFAT_ReadBlock(BlockAddress);
+		  VirtualFAT_ReadBlock(BlockAddress + i);
 		else
-		  VirtualFAT_WriteBlock(BlockAddress);
-
-		BlockAddress++;
+		  VirtualFAT_WriteBlock(BlockAddress + i);
 	}
 
 	/* Update the bytes transferred counter and succeed the command */
diff --git a/Bootloaders/MassStorage/Lib/VirtualFAT.h b/Bootloaders/MassStorage/Lib/VirtualFAT.h
index 58f5723f9a..d01f9be53e 100644
--- a/Bootloaders/MassStorage/Lib/VirtualFAT.h
+++ b/Bootloaders/MassStorage/Lib/VirtualFAT.h
@@ -139,15 +139,15 @@
 		enum
 		{
 			/** Boot sector disk block. */
-			DISK_BLOCK_BootBlock        = 0,
+			DISK_BLOCK_BootBlock          = 0,
 			/** First copy of the FAT table block. */
-			DISK_BLOCK_FATBlock1        = 1,
+			DISK_BLOCK_FATBlock1          = 1,
 			/** Second copy of the FAT table block. */
-			DISK_BLOCK_FATBlock2        = 2,
+			DISK_BLOCK_FATBlock2          = 2,
 			/** Root file and directory entries block. */
-			DISK_BLOCK_RootFilesBlock   = 3,
+			DISK_BLOCK_RootFilesBlock     = 3,
 			/** Start block of the disk data section. */
-			DISK_BLOCK_DataStartBlock   = 4,
+			DISK_BLOCK_DataStartBlock     = 4,
 		};
 
 	/* Type Definitions: */