Another bug fix from the merge.