Fix bad sync flow