Fix the sync on_* methods