fixing colliding issues