Fix synchronization issue