try to fix sync issues