diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
index 2f004a26..cbdc3ff0 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
@@ -382,10 +382,14 @@ public class MapDatabase implements ITileDataSource {
         long numCols = queryParameters.toBlockX - queryParameters.fromBlockX;
 
         //log.debug(numCols + "/" + numRows + " " + mCurrentCol + " " + mCurrentRow);
-        xmin = -16;
-        ymin = -16;
-        xmax = Tile.SIZE + 16;
-        ymax = Tile.SIZE + 16;
+
+        // Buffer is half the tile size
+        int buffer = Tile.SIZE / 2;
+
+        xmin = -buffer;
+        ymin = -buffer;
+        xmax = Tile.SIZE + buffer;
+        ymax = Tile.SIZE + buffer;
 
         if (numRows > 0) {
             int w = (int) (Tile.SIZE / (numCols + 1));