Updating to take account of fugitive change 5aaa657