diff --git a/xorriso/drive_mgt.c b/xorriso/drive_mgt.c
index 52a5741c..dbd9112c 100644
--- a/xorriso/drive_mgt.c
+++ b/xorriso/drive_mgt.c
@@ -769,7 +769,8 @@ int Xorriso_may_burn(struct XorrisO *xorriso, int flag)
 }
 
 
-/* @param flag bit2=do not try to read ISO heads
+/* @param flag bit1=report about output drive rather than input drive
+               bit2=do not try to read ISO heads
 */
 int Xorriso_toc_to_string(struct XorrisO *xorriso, char **toc_text, int flag)
 {
@@ -780,7 +781,7 @@ int Xorriso_toc_to_string(struct XorrisO *xorriso, char **toc_text, int flag)
  ret= Xorriso_push_outlists(xorriso, &stack_handle, 1);
  if(ret <= 0)
    goto ex;
- toc_ret= Xorriso_toc(xorriso, flag & 4);
+ toc_ret= Xorriso_toc(xorriso, flag & (2 | 4));
  ret= Xorriso_pull_outlists(xorriso, stack_handle, &results, &infos, 0);
  if(ret <= 0)
    goto ex;
@@ -2905,7 +2906,8 @@ int Xorriso_check_media(struct XorrisO *xorriso, struct SpotlisT **spotlist,
        goto ex;
      }
    }
-   Xorriso_toc_to_string(xorriso, &toc_info, 4 * !job->map_with_volid);
+   Xorriso_toc_to_string(xorriso, &toc_info,
+                         (2 * !!job->use_dev) | (4 * !job->map_with_volid));
  }
  ret= Xorriso_open_job_data_to(xorriso, job, 0);
  if(ret <= 0)
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 49c9de7f..46b43acb 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2013.02.26.082331"
+#define Xorriso_timestamP "2013.02.26.103233"