Attempt to prevent encoding errors in issue #5