diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index 2af0d80..e927f5b 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2015.10.19.174459"
+#define Cdrskin_timestamP "2015.10.23.103324"
diff --git a/libburn/spc.c b/libburn/spc.c
index 8be6fa2..50ae313 100644
--- a/libburn/spc.c
+++ b/libburn/spc.c
@@ -1753,12 +1753,12 @@ int scsi_show_command(unsigned char *opcode, int oplen, int dir,
 	if (flag & 1)
 		return 1;
 	if (opcode[0] == 0x2A) { /* WRITE 10 */
-		if (flag & 2)
+		if ((flag & 2) && oplen > 8)
 			fprintf(fp, "%d -> %d\n",
 				(opcode[7] << 8) | opcode[8], 
 				mmc_four_char_to_int(opcode + 2));
 	} else if (opcode[0] == 0xAA) { /* WRITE 12 */
-		if (flag & 2)
+		if ((flag & 2) && oplen > 9)
 			fprintf(fp, "%d -> %d\n",
 				mmc_four_char_to_int(opcode + 6),
 				mmc_four_char_to_int(opcode + 2));