SWC-1972: fix bug in evaluation selection