Moved enabler check