hbm mapping fix-1