Fix for Encoding issue #7