CMD fix