Improve hitbox collision