fixed arity bug in command macro