diff --git a/iscsi-scst/include/iscsi_scst_ver.h b/iscsi-scst/include/iscsi_scst_ver.h
index f884634da..42a22a41e 100644
--- a/iscsi-scst/include/iscsi_scst_ver.h
+++ b/iscsi-scst/include/iscsi_scst_ver.h
@@ -21,4 +21,4 @@
 #define ISCSI_VERSION_STRING_SUFFIX
 #endif
 
-#define ISCSI_VERSION_STRING	"2.0.0/0.4.17r214" ISCSI_VERSION_STRING_SUFFIX
+#define ISCSI_VERSION_STRING	"2.0.0-rc1" ISCSI_VERSION_STRING_SUFFIX
diff --git a/iscsi-scst/usr/iscsid.c b/iscsi-scst/usr/iscsid.c
index fd671288b..cda3b26e5 100644
--- a/iscsi-scst/usr/iscsid.c
+++ b/iscsi-scst/usr/iscsid.c
@@ -953,8 +953,10 @@ static void cmnd_exec_text(struct connection *conn)
 		return;
 	}
 
-	if (list_length_is_one(&conn->rsp_buf_list))
+	if (list_empty(&conn->rsp_buf_list) ||
+	    list_length_is_one(&conn->rsp_buf_list))
 		rsp->flags = ISCSI_FLG_FINAL;
+
 	rsp->ttt = conn->ttt;
 
 	rsp->stat_sn = cpu_to_be32(conn->stat_sn++);