due by fix / unicode hell fixes