Fixed CMD issue