diff --git a/src/nwconn.c b/src/nwconn.c
index b086a31..e98fc37 100644
--- a/src/nwconn.c
+++ b/src/nwconn.c
@@ -252,51 +252,7 @@ static void pr_debug_request()
   if (req_printed++) return;
   if (ncp_type == 0x2222) {
     int ufunc = 0;
-    
-switch (ncprequest->function) {
-      case 0x0e:
-      case 0x0f:
-      case 0x16:
-      case 0x17:
-      case 0x18:
-      case 0x22:
-      case 0x3b:
-      case 0x3c:
-      case 0x3d:
-      case 0x3e:
-      case 0x41:
-      case 0x42:
-      case 0x43:
-      case 0x44:
-      case 0x45:
-      case 0x46:
-      case 0x47:
-      case 0x48:
-      case 0x49:
-      case 0x4a:
-      case 0x4b:
-      case 0x4c:
-      case 0x4d:
-      case 0x4e:
-      case 0x4f:
-      case 0x50:
-      case 0x56:
-      case 0x57:
-      case 0x60:
-      case 0x61:
-      case 0x62:
-      case 0x63:
-      case 0x64:
-      case 0x65:
-      case 0x66:
-      case 0x67:
-      case 0x68:
-      case 0x6b:
-        debug_nwconn_fileop(ncprequest->function, requestdata, requestlen);
-        break;
-      default:
-        break;
-    }
+    switch (ncprequest->function) {
       case 0x16 :
       case 0x17 : ufunc = (int) *(requestdata+2); break;
       case 0x57 : ufunc = (int) *(requestdata);   break;
@@ -408,6 +364,51 @@ static int handle_ncp_serv(void)
 
   if (nw_debug > 5) pr_debug_request();
 
+  switch (function) {
+    case 0x0e:
+    case 0x0f:
+    case 0x16:
+    case 0x17:
+    case 0x18:
+    case 0x22:
+    case 0x3b:
+    case 0x3c:
+    case 0x3d:
+    case 0x3e:
+    case 0x41:
+    case 0x42:
+    case 0x43:
+    case 0x44:
+    case 0x45:
+    case 0x46:
+    case 0x47:
+    case 0x48:
+    case 0x49:
+    case 0x4a:
+    case 0x4b:
+    case 0x4c:
+    case 0x4d:
+    case 0x4e:
+    case 0x4f:
+    case 0x50:
+    case 0x56:
+    case 0x57:
+    case 0x60:
+    case 0x61:
+    case 0x62:
+    case 0x63:
+    case 0x64:
+    case 0x65:
+    case 0x66:
+    case 0x67:
+    case 0x68:
+    case 0x6b:
+      debug_nwconn_fileop((uint8)function, requestdata, requestlen);
+      break;
+    default:
+      break;
+  }
+
   if (ncp_type == 0x2222) {
     
     switch (function) {