Fix Command Line for Issue #18