Fixed minor bug introduced in last merge.