handler selection fix