Fix error introduced in last pull from upstream