Fix selector changes returning the previous selector state