fix the synchronization issue