fix ma so that the setup command is folded into the other commands, so