Fix "disabled default logic"