Actually fixed the collision bug this time.