QUICK-FIX fix selectable logic