fixing collides