Fixed colision handling