Fixing command line arguments issue