Fixed bug after upgrading CommandLine