Solving sync issue