Fix selector bug