Fixed problem in last merge.