diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h
index 039a4415..c7a77f74 100644
--- a/libburn/trunk/cdrskin/cdrskin_timestamp.h
+++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2012.01.01.124330"
+#define Cdrskin_timestamP "2012.01.01.124424"
diff --git a/libburn/trunk/libburn/drive.c b/libburn/trunk/libburn/drive.c
index 140881f9..74aa5448 100644
--- a/libburn/trunk/libburn/drive.c
+++ b/libburn/trunk/libburn/drive.c
@@ -2971,11 +2971,12 @@ int burn_disc_get_write_mode_demands(struct burn_disc *disc,
 				last_track_is_unknown = 1;
 			} else
 				last_track_is_unknown = 0;
-			if (mode != track->mode)
+			if ((mode & BURN_MODE_BITS) !=
+						(track->mode & BURN_MODE_BITS))
 				result->mixed_mode = 1;
-			if (track->mode == BURN_MODE1) {
+			if (track->mode & BURN_MODE1) {
 				result->block_types |= BURN_BLOCK_MODE1;
-			} else if (track->mode == BURN_AUDIO) {
+			} else if (track->mode & BURN_AUDIO) {
 				result->audio = 1;
 				result->block_types |= BURN_BLOCK_RAW0;
 				result->exotic_track = 1;