Fix for Unicode issues