--- a/src/ov-cell.cc	Wed Jan 14 02:06:23 2004 +0000
+++ b/src/ov-cell.cc	Thu Jan 15 02:11:59 2004 +0000
@@ -820,12 +820,24 @@
   if (have_h5giterate_bug)
     current_item = 2;   // Skip row/columns items in group
 
+#ifdef HAVE_H5GGET_NUM_OBJS
+  hsize_t num_obj = 0;
+  H5Gget_num_objs (loc_id, &num_obj);
+#endif
+
   for (int j = 0; j < nc; j++)
     {
       for (int i = 0; i < nr; i++)
 	{
-	  retval2 = H5Giterate (loc_id, name, &current_item,
-				hdf5_read_next_data, &dsub);
+
+#ifdef HAVE_H5GGET_NUM_OBJS
+	  if (current_item >= static_cast<int> (num_obj))
+	    retval2 = -1;
+	  else
+#endif
+	    retval2 = H5Giterate (loc_id, name, &current_item,
+				  hdf5_read_next_data, &dsub);
+
 	  if (retval2 <= 0)
 	    break;