Fix to remove unncessary casting to get hp values