Added nasty UnicodeDecodeError workaround