Bugfix with regards to maps.