diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index ec24925..3df43da 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -53,6 +53,7 @@
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
+import org.osmdroid.views.overlay.Overlay;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -96,7 +97,7 @@
     private DrawerLayout drawerLayout;
     private ListView listView;
 
-    private List[] poiMarkers;
+    private List<Marker>[] poiMarkers;
 
     private String provider;
     private Location mLocation;
@@ -252,7 +253,6 @@
             List<Poi> tempPoiList = dbHandler.getPoiByType(type);
             for(int i=0; i<tempPoiList.size(); ++i){
                 Poi poi = tempPoiList.get(i);
-                poiMarkers[type].add(poi);
                 GeoPoint gp = new GeoPoint(poi.getLat(), poi.getLon());
                 String snippetText = res.getString(R.string.osm_marker_snippet, gp.getLatitude(), gp.getLongitude(), gp.getAltitude());
                 String subDescText;
@@ -280,6 +280,7 @@
                 LayerDrawable icon = new LayerDrawable(iconLayer);
                 positionMarker.setIcon(icon);
                 mapView.getOverlays().add(positionMarker);
+                poiMarkers[type].add(positionMarker);
             }
             mapView.invalidate();
         } else {
@@ -290,8 +291,8 @@
             //tv.setTypeface(tf);
             Toaster("You disabled " + entries[position]);
             for(int i=0; i<poiMarkers[type].size(); ++i){
-                Object poi = poiMarkers[type].get(i);
-                mapView.getOverlays().remove(poi); //TODO does not remove the poi
+                Overlay poi = poiMarkers[type].get(i);
+                mapView.getOverlays().remove(poi);
             }
             poiMarkers[type] = new ArrayList<>();
             mapView.invalidate();