Fix cmd right