hbm mapping fix