Merge pull request #261 from wongoo/fix-259

Fix map decode error issue #259