Fix for CMD check