diff --git a/lib/_cdio_osx.c b/lib/_cdio_osx.c
index 10b7237d..3923f818 100644
--- a/lib/_cdio_osx.c
+++ b/lib/_cdio_osx.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_osx.c,v 1.54 2004/08/16 01:47:49 rocky Exp $
+    $Id: _cdio_osx.c,v 1.55 2004/08/18 11:31:58 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> 
     from vcdimager code: 
@@ -34,7 +34,7 @@
 #include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.54 2004/08/16 01:47:49 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.55 2004/08/18 11:31:58 rocky Exp $";
 
 #include <cdio/sector.h>
 #include <cdio/util.h>
@@ -148,6 +148,10 @@ run_scsi_cmd_osx( const void *p_user_data,
 
   if (NULL == p_user_data) return 2;
 
+  /* Make sure pp_scsiTaskDeviceInterface is initialized. FIXME: The code
+     should probably be reorganized better for this. */
+  if (!p_env->gen.toc_init) read_toc_osx (p_user_data) ;
+
   sc = p_env->pp_scsiTaskDeviceInterface;
 
   cmd = (*sc)->CreateSCSITask(sc);