Fixed issue #1024 - EncodingKludge issue identified and fixed