Why are these changes here? Did this not get fixed by Nicolas's change?