Colliding fixes