Another attempted fix at multi-command syndrome