diff --git a/MapsforgeTiles/MapsforgeWrapper/TileRenderer.cs b/MapsforgeTiles/MapsforgeWrapper/TileRenderer.cs
index 1934f136..873784ce 100644
--- a/MapsforgeTiles/MapsforgeWrapper/TileRenderer.cs
+++ b/MapsforgeTiles/MapsforgeWrapper/TileRenderer.cs
@@ -28,11 +28,12 @@ namespace MapsforgeWrapper
             else
             {
                 var multiMapDataStore = new MultiMapDataStore(MultiMapDataStore.DataPolicy.DEDUPLICATE);
+                dataStore = multiMapDataStore;
+
                 foreach (var file in Directory.EnumerateFiles(mapFilePath, "*.map"))
                 {
                     multiMapDataStore.addMapDataStore(new MapFile(file), false, false);
                 }
-                dataStore = multiMapDataStore;
             }
         }
 
diff --git a/MapsforgeTiles/MapsforgeWrapper/pom.xml b/MapsforgeTiles/MapsforgeWrapper/pom.xml
index e91f00d0..9af8ff68 100644
--- a/MapsforgeTiles/MapsforgeWrapper/pom.xml
+++ b/MapsforgeTiles/MapsforgeWrapper/pom.xml
@@ -20,11 +20,6 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.mapsforge.mapsforge</groupId>
-            <artifactId>mapsforge-core</artifactId>
-            <version>0.27.0</version>
-        </dependency>
         <dependency>
             <groupId>com.github.mapsforge.mapsforge</groupId>
             <artifactId>mapsforge-map-awt</artifactId>
diff --git a/MapsforgeTiles/README.md b/MapsforgeTiles/README.md
index c2392709..53eea02d 100644
--- a/MapsforgeTiles/README.md
+++ b/MapsforgeTiles/README.md
@@ -29,12 +29,12 @@ map.MapLayer = new MapTileLayer
 
 ---
 
-Apparently, IKVM's `MavenReference` does not work with other Maven repositories than Maven Central.
-Mapsforge however, is hosted by JitPack. So the currently only working way to utilize Mapsforge is
-by creating a local JAR file with all dependencies required by `TileRenderer` and reference it via
-`IkvmReference`.
+Building MapsforgeWrapper with IKVM's `MavenReference` fails - apparently because a dependency
+on the XML Pull Parser library could not properly be resolved. So the currently only working way
+to use Mapsforge is by creating a local JAR file with all dependencies required by MapsforgeWrapper
+and reference it via `IkvmReference`.
 
-This means that you need [Maven](https://maven.apache.org/) to build the MapsforgeWrapper library.
+This means that [Maven](https://maven.apache.org/) is needed to build the MapsforgeWrapper library.
 There is a custom `PreBuild` event in `MapsforgeWrapper.csproj` which executes the command
 ```
 mvn package