Fixes issue #350, unicode errors