Fix for disabling all commands