Fix selection for #13716