LPS-43193 Wrong hbm class extraction logic