Fix as result of merge.