fixed sync issues