Fixing for hdf-header tree change