added some overlooked cases for collisions