diff --git a/tuve.c b/tuve.c
index 388d593..e305a90 100644
--- a/tuve.c
+++ b/tuve.c
@@ -77,13 +77,16 @@
   if (cmd[userConnection->recLen - 2] == 13)
     cmd[userConnection->recLen - 2] = '\0';
 
-  writeLog(3,"DATA:  (%s)[%s]\n",userConnection->userInfo.username,cmd);
 
-  if (strstr(userConnection->data," ")) {
-    cmd  = strtok_r(userConnection->data," ",&tok_last);
+  if (strstr(cmd," ")) {
+    cmd  = strtok_r(cmd," ",&tok_last);
     data = strtok_r(NULL,"\n",&tok_last); 
     tok_last = 0x0;
+    writeLog(3,"DATA:  (%s)CMD: [%s], Data: [%s]\n",userConnection->userInfo.username,cmd,data);
     }
+  else 
+    writeLog(3,"DATA:  (%s)CMD: [%s]\n",userConnection->userInfo.username,cmd);
+
 
   if (!strcasecmp(cmd,"IDENT")) {
     writeLog(2,"(ident)\n");