Fixing bug introduced during previous merge.