fixed sync problems