Fix synchronization - leftover from refactoring