Better selector for #373