Add a selector

Reduced the risk that pick up a value in the range of unexpected