Collision bug and spell management