diff --git a/VersionNum b/VersionNum
index 079160e790d36a0881dc25fda4f8a9daf51b6dd7..f050a3bbd095e86559da62f1be049cf99e67428c 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (0.17)
+/* (0.18)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.17
+#define Module_MajorVersion_CMHG        0.18
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                26 Jun 2013
+#define Module_Date_CMHG                13 Jul 2013
 
-#define Module_MajorVersion             "0.17"
-#define Module_Version                  17
+#define Module_MajorVersion             "0.18"
+#define Module_Version                  18
 #define Module_MinorVersion             ""
-#define Module_Date                     "26 Jun 2013"
+#define Module_Date                     "13 Jul 2013"
 
-#define Module_ApplicationDate          "26-Jun-13"
+#define Module_ApplicationDate          "13-Jul-13"
 
 #define Module_ComponentName            "SCSISoftUSB"
 #define Module_ComponentPath            "mixed/RiscOS/Sources/HWSupport/SCSI/SCSISoftUSB"
 
-#define Module_FullVersion              "0.17"
-#define Module_HelpVersion              "0.17 (26 Jun 2013)"
-#define Module_LibraryVersionInfo       "0:17"
+#define Module_FullVersion              "0.18"
+#define Module_HelpVersion              "0.18 (13 Jul 2013)"
+#define Module_LibraryVersionInfo       "0:18"
diff --git a/c/glue b/c/glue
index d2e219bf30ccba831be5ff9a37f75c8dbf28d0bc..4b9b0421aaed67a06fdc8de3ac2d8a679e9ff78b 100644
--- a/c/glue
+++ b/c/glue
@@ -1136,11 +1136,11 @@ usbd_status usbd_open_pipe(usbd_interface_handle iface, u_int8_t address, u_int8
   char filename[sizeof "USBxxxxxxxxxxxxxxxx#interfacexxx;alternatexxx;endpointxxx;bulk;sizexxxxxx:" + 1];
   if (pipe) *pipe = 0; /* in case of error */
   
-  sprintf(filename, "%s#interface%d;alternate%d;endpoint%d;bulk;size%d:",
+  sprintf(filename, "%s#endpoint%d;interface%d;alternate%d;bulk;size%d:",
          device->devicefs_name,
+         address & 0x7F,
          device->interface,
          device->alternate,
-         address & 0x7F,
          BUFFER_SIZE);
   DEBUGf("\n usbd_open_pipe %s\n",filename);
   _swix(OS_Claim, _INR(0,2),
diff --git a/c/module b/c/module
index c989926bb9996682975932c207c531765180e8a3..3fa927df518fae479a005f2970def91d15f61cbc 100644
--- a/c/module
+++ b/c/module
@@ -1012,7 +1012,7 @@ _kernel_oserror *module_UpCallVHandler(_kernel_swi_regs *r, void *pw)
 {
   IGNORE(pw);
   if (((r->r[0] == 8) || (r->r[0] == 9) /* Buffer filling/emptying */ ) && global_TickerList && !global_RTSupportPollword) glue_BufferThresholdCheck(r->r[1],r->r[0]==8);
-  if (r->r[0] == 11 /* stream closed */) glue_ReopenStream(r->r[3]);
+  if (!No_New_Stuff && (r->r[0] == 11 /* stream closed */)) glue_ReopenStream(r->r[3]);
   return NULL;
 }