fix calling of selection handler