Fixed enabled / disabled check