Fix failure during enable/disable of features