2 files changed, 15 insertions, 1 deletions
diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90
index a3bef37..45d9f38 100644
--- a/fortran/src/H5Fff.F90
+++ b/fortran/src/H5Fff.F90
@@ -42,6 +42,9 @@ MODULE H5F
   USE H5GLOBAL
   IMPLICIT NONE
 
+  ! Number of objects opened in H5open_f
+  INTEGER(SIZE_T) :: H5OPEN_NUM_OPEN_OBJ
+
 CONTAINS
 !****s* H5F/h5fcreate_f
 !
@@ -616,9 +619,14 @@ CONTAINS
          INTEGER(SIZE_T), INTENT(OUT) :: obj_count
        END FUNCTION h5fget_obj_count_c
     END INTERFACE
-
+    
     hdferr = h5fget_obj_count_c(file_id, obj_type, obj_count)
 
+    ! Don't include objects created by H5open in the H5F_OBJ_ALL_F count
+    IF(file_id.EQ.INT(H5F_OBJ_ALL_F,HID_T))THEN
+       obj_count = obj_count - H5OPEN_NUM_OPEN_OBJ
+    ENDIF
+
   END SUBROUTINE h5fget_obj_count_f
 
 !****s* H5F/h5fget_obj_ids_f
diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90
index db57f03..15fe37a 100644
--- a/fortran/src/H5_ff.F90
+++ b/fortran/src/H5_ff.F90
@@ -169,8 +169,10 @@ CONTAINS
 ! October 13, 2011
 ! Fortran90 Interface:
   SUBROUTINE h5open_f(error)
+    USE H5F, ONLY : h5fget_obj_count_f, H5OPEN_NUM_OPEN_OBJ 
     IMPLICIT NONE
     INTEGER, INTENT(OUT) :: error
+    INTEGER(SIZE_T) :: H5OPEN_NUM_OPEN_OBJ_LOC = 0
 !*****
     INTERFACE
 
@@ -612,6 +614,10 @@ CONTAINS
     H5_SZIP_EC_OM_F = H5LIB_flags(1)
     H5_SZIP_NN_OM_F = H5LIB_flags(2)
 
+    CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, H5OPEN_NUM_OPEN_OBJ_LOC,  error)
+
+    H5OPEN_NUM_OPEN_OBJ = H5OPEN_NUM_OPEN_OBJ_LOC
+
   END SUBROUTINE h5open_f
 
 !****s* H5LIB/h5close_f