Fixed issue with command line arguments not being handled properly