Good concise fix of the unicode issue, will clean up code next.