Attempt to fix broken syncing