Make COMMANDs work again.