Fixed some synchronization