Fixes #185

This fix eliminates unnecessary encoding-unicode switching.
The test case proposed by the PR can't be successfull as currently written.