Fix compatibility with hcm layer