Fix bug introduced while rewriting make_sync_command