Fix selector part 2