Bugfix Basemap