Fixing CLI args III