Attempt again to fix UnicodeDecodeError (issue #658)