Small improvement in object selector.