Fixed synchronization issue