CommandLine modules fix