Fixed macro substitution in command text

Thanks to Oliver Tatzmann for the bug report