diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index b07224d..d2cbf3c 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2011.12.12.164452"
+#define Cdrskin_timestamP "2011.12.12.181346"
diff --git a/libburn/write.c b/libburn/write.c
index 37098b5..7b0029d 100644
--- a/libburn/write.c
+++ b/libburn/write.c
@@ -937,10 +937,11 @@ static int burn_decide_cdtext_tab(int block, int pack_type,
 	if (((cdt_curr->flags >> idx) & 1) != ((cdt_prev->flags >> idx) & 1))
 		return 0;
 	length = cdt_curr->length[idx];
-	if (length != cdt_prev->length[idx] || length == 0)
+	if (length != cdt_prev->length[idx] ||
+				length <= 1 + ((cdt_curr->flags >> idx) & 1))
 		return 0;
 	for (j = 0; j < length; j++)
-		if (cdt_curr->payload[j] != cdt_prev->payload[j])
+		if (cdt_curr->payload[idx][j] != cdt_prev->payload[idx][j])
 	break;
 	if (j < length)
 		return 0;