Fixing argument parsing bug