Fix for last of hitmapping issues