fix collisions again?