Again. Fix the remaining inconsistent synchronization.