Fixed encoding issues

https://www.pivotaltracker.com/story/show/80322914