Improve hitbox detection