return;
                }
 
-               /* Decrement the blocks remaining counter and reset the sub block counter */
+               /* Decrement the blocks remaining counter */
                TotalBlocks--;
        }
 
 
                                /* Send the Dataflash buffer write command */
                                Dataflash_ToggleSelectedChipCS();
-                               Dataflash_SendByte(DF_CMD_BUFF1WRITE);
+                               Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2WRITE : DF_CMD_BUFF1WRITE);
                                Dataflash_SendAddressBytes(0, 0);
                        }
 
                        BytesInBlockDiv16++;
                }
 
-               /* Decrement the blocks remaining counter and reset the sub block counter */
+               /* Decrement the blocks remaining counter */
                TotalBlocks--;
        }