Fix sensor picking