Fix copying maps
Merge pull request #830 from mkienenb/ordered-hashmap-copy-fix

Fix copying maps