Fixing desync issue