Small improvement on selector