Fix for enable and disable subcommands