fixed sync issues
fixed sync issues