Fixed issue with command line arguments not being parsed correctly