HHH-6781 Closed fixed this issue for annotations, but not for hbm.xml mappings.
This fix is specifically for hbm.xml mappings.