Final part of UTF-8 issue commit.