diff --git a/libsrc/v1hpg.c b/libsrc/v1hpg.c
index e464c091f..07c322ce5 100644
--- a/libsrc/v1hpg.c
+++ b/libsrc/v1hpg.c
@@ -1220,7 +1220,8 @@ NC_computeshapes(NC3_INFO* ncp)
 	  		if(first_rec == NULL)
 				first_rec = *vpp;
 			if((*vpp)->len == UINT32_MAX &&
-                           fIsSet(ncp->flags, NC_64BIT_OFFSET)) /* Flag for large last record */
+                           (fIsSet(ncp->flags, NC_64BIT_OFFSET) ||
+                            fIsSet(ncp->flags, NC_64BIT_DATA))) /* Flag for large last record */
                             ncp->recsize += (*vpp)->dsizes[0] * (*vpp)->xsz;
 			else
 			    ncp->recsize += (*vpp)->len;