Fixing colliding