Fix cmd build. Please check your changes before commiting.