Fix synchronization issue

close #25