Bugfixing the collision handling still