Fix enabling/disabling