COOPR-625: fix bug: commands do not function when given on command line
COOPR-625: improve fix
Merge pull request #801 from cybervisiontech/coopr-625

COOPR-625: CLI: commands do not function when given on command line