added conditional to cmd-override