Fixing synchronization issue