Another attempt to fix sync issues, hopefully last