Fixing changes from the last merge.
2 files changed