Bugfix, better collision