fix map keys
Merge pull request #95 from datvikash/feature-issue-98

fix map keys