Fixing command line handling