Fix exception after merge.