Fix error in last merge.