WIP fix hitmapping