command: better solution for #204