sync issues fixed again