diff --git a/lib/iscsi-command.c b/lib/iscsi-command.c
index 8b20534..6c133fe 100644
--- a/lib/iscsi-command.c
+++ b/lib/iscsi-command.c
@@ -267,6 +267,7 @@ iscsi_scsi_command_async(struct iscsi_context *iscsi, int lun,
 	/* lun */
 	iscsi_pdu_set_lun(pdu, lun);
 	pdu->lun = lun;
+	task->lun = lun;
 
 	/* expxferlen */
 	iscsi_pdu_set_expxferlen(pdu, task->expxferlen);
@@ -290,11 +291,6 @@ iscsi_scsi_command_async(struct iscsi_context *iscsi, int lun,
 		iscsi_send_unsolicited_data_out(iscsi, pdu);
 	}
 
-	/* remember cmdsn and itt so we can use task management */
-	task->cmdsn = pdu->cmdsn;
-	task->itt   = pdu->itt;
-	task->lun   = lun;
-
 	return 0;
 }
 
diff --git a/lib/pdu.c b/lib/pdu.c
index c98dd3c..087d08d 100644
--- a/lib/pdu.c
+++ b/lib/pdu.c
@@ -800,6 +800,11 @@ iscsi_pdu_set_cmdsn(struct iscsi_pdu *pdu, uint32_t cmdsn)
 {
 	scsi_set_uint32(&pdu->outdata.data[24], cmdsn);
 	pdu->cmdsn = cmdsn;
+	if (pdu->scsi_cbdata.task) {
+                /* remember cmdsn and itt so we can use task management */
+                pdu->scsi_cbdata.task->cmdsn = pdu->cmdsn;
+                pdu->scsi_cbdata.task->itt   = pdu->itt;
+        }
 }
 
 void
diff --git a/lib/socket.c b/lib/socket.c
index fc962a6..2a0a248 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -149,7 +149,7 @@ iscsi_add_to_outqueue(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
 
  finished:
         iscsi_mt_spin_unlock(&iscsi->iscsi_lock);
-
+        
         /* TODO QQQ need to immediately send for the non multithreading case too
          * and for the Windows API too */
 #if defined(HAVE_MULTITHREADING) && defined(HAVE_PTHREAD)