diff --git a/vtm/src/org/oscim/layers/tile/TileLayer.java b/vtm/src/org/oscim/layers/tile/TileLayer.java
index ba99e71a..5754921c 100644
--- a/vtm/src/org/oscim/layers/tile/TileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/TileLayer.java
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013 Hannes Janetzek
  * Copyright 2016 Andrey Novikov
+ * Copyright 2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -22,16 +23,10 @@ import org.oscim.event.Event;
 import org.oscim.layers.Layer;
 import org.oscim.map.Map;
 import org.oscim.map.Map.UpdateListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.oscim.tiling.TileSource;
 
-/**
- * TODO - add a TileLayer.Builder
- */
 public abstract class TileLayer extends Layer implements UpdateListener {
 
-    static final Logger log = LoggerFactory.getLogger(TileLayer.class);
-
     private int mNumLoaders = 4;
 
     /**
@@ -42,6 +37,8 @@ public abstract class TileLayer extends Layer implements UpdateListener {
 
     protected TileLoader[] mTileLoader;
 
+    protected TileSource mTileSource;
+
     public TileLayer(Map map, TileManager tileManager, TileRenderer renderer) {
         super(map);
         renderer.setTileManager(tileManager);
@@ -116,6 +113,8 @@ public abstract class TileLayer extends Layer implements UpdateListener {
             loader.finish();
             loader.dispose();
         }
+        if (mTileSource != null)
+            mTileSource.close();
     }
 
     void notifyLoaders() {
@@ -148,4 +147,8 @@ public abstract class TileLayer extends Layer implements UpdateListener {
     public TileManager getManager() {
         return mTileManager;
     }
+
+    public TileSource getTileSource() {
+        return mTileSource;
+    }
 }
diff --git a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
index 330b5bf8..24bb58ac 100644
--- a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 Hannes Janetzek
  * Copyright 2017 Andrey Novikov
- * Copyright 2017-2018 devemux86
+ * Copyright 2017-2020 devemux86
  * Copyright 2019 Gustl22
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
@@ -38,8 +38,6 @@ public class BitmapTileLayer extends TileLayer {
 
     private static final int CACHE_LIMIT = 40;
 
-    protected final TileSource mTileSource;
-
     /**
      * Bitmap alpha in range 0 to 1.
      */
diff --git a/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLayer.java b/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLayer.java
index afc3078f..33c77339 100644
--- a/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLayer.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
+ * Copyright 2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -34,8 +35,6 @@ public class S3DBTileLayer extends TileLayer {
     private static final int MIN_ZOOM = 16;
     private static final int MAX_ZOOM = 16;
 
-    private final TileSource mTileSource;
-
     public S3DBTileLayer(Map map, TileSource tileSource) {
         this(map, tileSource, true, false);
     }
diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
index 90c7b6f9..302aca15 100644
--- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013 Hannes Janetzek
  * Copyright 2016 Longri
+ * Copyright 2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -18,11 +19,7 @@
 package org.oscim.layers.tile.vector;
 
 import org.oscim.core.MapElement;
-import org.oscim.layers.tile.MapTile;
-import org.oscim.layers.tile.TileLayer;
-import org.oscim.layers.tile.TileLoader;
-import org.oscim.layers.tile.TileManager;
-import org.oscim.layers.tile.VectorTileRenderer;
+import org.oscim.layers.tile.*;
 import org.oscim.map.Map;
 import org.oscim.renderer.bucket.RenderBuckets;
 import org.oscim.theme.IRenderTheme;
@@ -42,8 +39,6 @@ import org.slf4j.LoggerFactory;
 public class VectorTileLayer extends TileLayer {
     static final Logger log = LoggerFactory.getLogger(VectorTileLayer.class);
 
-    protected TileSource mTileSource;
-
     public VectorTileLayer(Map map, TileSource tileSource) {
         this(map, new TileManager(map,
                         100),
@@ -104,10 +99,6 @@ public class VectorTileLayer extends TileLayer {
         return true;
     }
 
-    public TileSource getTileSource() {
-        return mTileSource;
-    }
-
     /**
      * Set {@link IRenderTheme} used by {@link TileLoader}
      */
@@ -178,13 +169,6 @@ public class VectorTileLayer extends TileLayer {
         mLoaderThemeHooks.append(new LList<TileLoaderThemeHook>(h));
     }
 
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        if (mTileSource != null)
-            mTileSource.close();
-    }
-
     public void callThemeHooks(MapTile tile, RenderBuckets layers, MapElement element,
                                RenderStyle style, int level) {