Synchronization fix