CMD check fix