Fixed breakage caused by h5 changes