Issue#44 Fixed the encode/decode error