Make auto enable actually work