diff --git a/fortran/src/H5Eff.F90 b/fortran/src/H5Eff.F90
index c519ddc9f83..a95028fe0e6 100644
--- a/fortran/src/H5Eff.F90
+++ b/fortran/src/H5Eff.F90
@@ -388,26 +388,26 @@ END FUNCTION h5epush_c
     IF (PRESENT(func)) func_def = func
     IF (PRESENT(line)) line_def = line
 
-    IF (PRESENT(arg1)) arg1_def = C_LOC(arg1)
-    IF (PRESENT(arg2)) arg2_def = C_LOC(arg2)
-    IF (PRESENT(arg3)) arg3_def = C_LOC(arg3)
-    IF (PRESENT(arg4)) arg4_def = C_LOC(arg4)
-    IF (PRESENT(arg5)) arg5_def = C_LOC(arg5)
-    IF (PRESENT(arg6)) arg6_def = C_LOC(arg6)
-    IF (PRESENT(arg7)) arg7_def = C_LOC(arg7)
-    IF (PRESENT(arg8)) arg8_def = C_LOC(arg8)
-    IF (PRESENT(arg9)) arg9_def = C_LOC(arg9)
-    IF (PRESENT(arg10)) arg10_def = C_LOC(arg10)
-    IF (PRESENT(arg11)) arg11_def = C_LOC(arg11)
-    IF (PRESENT(arg12)) arg12_def = C_LOC(arg12)
-    IF (PRESENT(arg13)) arg13_def = C_LOC(arg13)
-    IF (PRESENT(arg14)) arg14_def = C_LOC(arg14)
-    IF (PRESENT(arg15)) arg15_def = C_LOC(arg15)
-    IF (PRESENT(arg16)) arg16_def = C_LOC(arg16)
-    IF (PRESENT(arg17)) arg17_def = C_LOC(arg17)
-    IF (PRESENT(arg18)) arg18_def = C_LOC(arg18)
-    IF (PRESENT(arg19)) arg19_def = C_LOC(arg19)
-    IF (PRESENT(arg20)) arg20_def = C_LOC(arg20)   
+    IF (PRESENT(arg1)) arg1_def = C_LOC(arg1(1:1))
+    IF (PRESENT(arg2)) arg2_def = C_LOC(arg2(1:1))
+    IF (PRESENT(arg3)) arg3_def = C_LOC(arg3(1:1))
+    IF (PRESENT(arg4)) arg4_def = C_LOC(arg4(1:1))
+    IF (PRESENT(arg5)) arg5_def = C_LOC(arg5(1:1))
+    IF (PRESENT(arg6)) arg6_def = C_LOC(arg6(1:1))
+    IF (PRESENT(arg7)) arg7_def = C_LOC(arg7(1:1))
+    IF (PRESENT(arg8)) arg8_def = C_LOC(arg8(1:1))
+    IF (PRESENT(arg9)) arg9_def = C_LOC(arg9(1:1))
+    IF (PRESENT(arg10)) arg10_def = C_LOC(arg10(1:1))
+    IF (PRESENT(arg11)) arg11_def = C_LOC(arg11(1:1))
+    IF (PRESENT(arg12)) arg12_def = C_LOC(arg12(1:1))
+    IF (PRESENT(arg13)) arg13_def = C_LOC(arg13(1:1))
+    IF (PRESENT(arg14)) arg14_def = C_LOC(arg14(1:1))
+    IF (PRESENT(arg15)) arg15_def = C_LOC(arg15(1:1))
+    IF (PRESENT(arg16)) arg16_def = C_LOC(arg16(1:1))
+    IF (PRESENT(arg17)) arg17_def = C_LOC(arg17(1:1))
+    IF (PRESENT(arg18)) arg18_def = C_LOC(arg18(1:1))
+    IF (PRESENT(arg19)) arg19_def = C_LOC(arg19(1:1))
+    IF (PRESENT(arg20)) arg20_def = C_LOC(arg20(1:1))
 
     hdferr = h5epush_c(err_stack, cls_id, maj_id, min_id, msg, LEN(msg), &
          file_def, func_def, line_def, &