Fix and complete control/control_sync_with_clock