Issue #32 fix encoding