Solving colaboration issue