Fixing annoying command line length bug