sync issues fixed