Fix according to CMD check