Fixed the issue with processing extra command line argument