Fix another self conflict