fix sync problems