bug fix: isEnabled is not being persisted