fix issue #2 - Charset broken