Fixed isEnabled check