Fix for synchronization