wip - Fix invalid commands when calling macro.