Fix one more issue from the merge.