Fix for command line retrieval

For issue #19