Fixes #185

This fix eliminates unnecessary encoding-unicode switching.