Collision bugfix