Fix selection handler