Fix synchronization