Fix enabling\disabling