Fixing bug introduced with last merge.