diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index 4c5d547..881219c 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2014.06.09.183251"
+#define Cdrskin_timestamP "2014.06.10.130721"
diff --git a/libburn/drive.c b/libburn/drive.c
index cf8e1f8..48b1cb1 100644
--- a/libburn/drive.c
+++ b/libburn/drive.c
@@ -2638,7 +2638,7 @@ off_t burn_disc_available_space(struct burn_drive *d,
 				 struct burn_write_opts *o)
 {
 	int lba, nwa, ret;
-	off_t bytes;
+	off_t bytes, start_byte = 0;
 
 	if (burn_drive_is_released(d))
 		return 0;
@@ -2647,7 +2647,9 @@ off_t burn_disc_available_space(struct burn_drive *d,
 	if (d->drive_role == 0)
 		return 0;
 	if (d->drive_role != 1) {
-		ret = burn_os_stdio_capacity(d->devname, o->start_byte, &bytes);
+		if (o != NULL)
+			start_byte = o->start_byte;
+		ret = burn_os_stdio_capacity(d->devname, start_byte, &bytes);
 		if (ret != 1)
 			bytes = d->media_capacity_remaining;
 		if (bytes <= 0)