put back the collisions fixes