Bug fix for upgrade of Cmd