Fixing desync