Fix selector creation