Fix issue after merge.