Bugfix: We should use a new map instance each time.