diff --git a/VersionNum b/VersionNum
index 15e82c13a039e2917fbeefe387d92614e764f814..e7914cbf4759ce580face82cb95438e76cb19bc0 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (0.22)
+/* (0.23)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.22
+#define Module_MajorVersion_CMHG        0.23
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                29 May 2018
+#define Module_Date_CMHG                01 Jul 2018
 
-#define Module_MajorVersion             "0.22"
-#define Module_Version                  22
+#define Module_MajorVersion             "0.23"
+#define Module_Version                  23
 #define Module_MinorVersion             ""
-#define Module_Date                     "29 May 2018"
+#define Module_Date                     "01 Jul 2018"
 
-#define Module_ApplicationDate          "29-May-18"
+#define Module_ApplicationDate          "01-Jul-18"
 
 #define Module_ComponentName            "SCSISoftUSB"
 #define Module_ComponentPath            "mixed/RiscOS/Sources/HWSupport/SCSI/SCSISoftUSB"
 
-#define Module_FullVersion              "0.22"
-#define Module_HelpVersion              "0.22 (29 May 2018)"
-#define Module_LibraryVersionInfo       "0:22"
+#define Module_FullVersion              "0.23"
+#define Module_HelpVersion              "0.23 (01 Jul 2018)"
+#define Module_LibraryVersionInfo       "0:23"
diff --git a/c/glue b/c/glue
index 03a74c86a4724f4a8eea3e20e2d95123200f88f8..2e8d4b79110abaf0f8971defc928f47f960b3a08 100644
--- a/c/glue
+++ b/c/glue
@@ -666,7 +666,12 @@ void glue_Tick(my_usb_device_t *device)
       }
       _kernel_irqs_off();
     }
-    DEBUGf("Still in RX buffer: = %x, ", buffer_used);
+    DEBUGf("Still in RX buffer: = %x, needed: = %x ", buffer_used,device->curr_transferlength);
+    if (buffer_used > device->curr_transferlength)
+    {
+      // flush the buffer.. we're done here
+      REMOVE_BLOCK(device->current_pipe->buffer, softc->scbulkoutbuf, buffer_used);
+    }
     e = _swix(DeviceFS_CallDevice, _INR(0,2),
               DeviceCall_MonitorRX,
               device->devicefs_name,