collision bugfixes