Fix after merge.
2 files changed