Fix error in merge from lyonel's upstream repo