issue #611: more preselection