Fixed issue with collisions