Bugfix Collision Part II