diff --git a/lib/image/bincue.c b/lib/image/bincue.c
index 6363c55e..5fd972ba 100644
--- a/lib/image/bincue.c
+++ b/lib/image/bincue.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bincue.c,v 1.40 2004/08/13 13:04:37 rocky Exp $
+    $Id: bincue.c,v 1.41 2004/08/16 02:04:08 rocky Exp $
 
     Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -26,7 +26,7 @@
    (*.cue).
 */
 
-static const char _rcsid[] = "$Id: bincue.c,v 1.40 2004/08/13 13:04:37 rocky Exp $";
+static const char _rcsid[] = "$Id: bincue.c,v 1.41 2004/08/16 02:04:08 rocky Exp $";
 
 #include "image.h"
 #include "cdio_assert.h"
@@ -766,6 +766,10 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
     }
   }
 
+  if (NULL != cd) {
+    cd->gen.toc_init = true;
+  }
+
   fclose (fp);
   return true;
 
diff --git a/lib/image/cdrdao.c b/lib/image/cdrdao.c
index 4f40c837..8bbd3f3c 100644
--- a/lib/image/cdrdao.c
+++ b/lib/image/cdrdao.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cdrdao.c,v 1.25 2004/08/13 13:04:37 rocky Exp $
+    $Id: cdrdao.c,v 1.26 2004/08/16 02:04:08 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
     toc reading routine adapted from cuetools
@@ -25,7 +25,7 @@
    (*.cue).
 */
 
-static const char _rcsid[] = "$Id: cdrdao.c,v 1.25 2004/08/13 13:04:37 rocky Exp $";
+static const char _rcsid[] = "$Id: cdrdao.c,v 1.26 2004/08/16 02:04:08 rocky Exp $";
 
 #include "image.h"
 #include "cdio_assert.h"
@@ -811,7 +811,11 @@ parse_tocfile (_img_private_t *cd, const char *psz_cue_name)
     }
   }
     
-  if (NULL != cd) cd->gen.i_tracks = i+1;
+  if (NULL != cd) {
+    cd->gen.i_tracks = i+1;
+    cd->gen.toc_init = true;
+  }
+
   fclose (fp);
   return true;
 
diff --git a/lib/image/nrg.c b/lib/image/nrg.c
index 3b1f06e2..0dab569e 100644
--- a/lib/image/nrg.c
+++ b/lib/image/nrg.c
@@ -1,5 +1,5 @@
 /*
-    $Id: nrg.c,v 1.37 2004/08/13 13:04:37 rocky Exp $
+    $Id: nrg.c,v 1.38 2004/08/16 02:04:08 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -45,7 +45,7 @@
 #include "_cdio_stdio.h"
 #include "nrg.h"
 
-static const char _rcsid[] = "$Id: nrg.c,v 1.37 2004/08/13 13:04:37 rocky Exp $";
+static const char _rcsid[] = "$Id: nrg.c,v 1.38 2004/08/16 02:04:08 rocky Exp $";
 
 
 /* reader */
@@ -735,6 +735,7 @@ parse_nrg (_img_private_t *env, const char *psz_nrg_name)
 
   env->gen.b_cdtext_init  = true;
   env->gen.b_cdtext_error = false;
+  env->gen.toc_init       = true;
   free(footer_buf);
   return true;
 }