fixed map serialization
Merge branch 'origin/map_issues'