Fixing some synchronization