HM and crash fix