fixed needsSelection behaviour