diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java b/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
index 0ba952c0..34a63f2d 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
@@ -243,7 +243,7 @@ public class MindMap {
 
             // Add namespace...
             result = result.replaceFirst("<svg ", "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" ");
-            result = result.replaceAll("<image([^>]+)>", "<image$1/>");
+//            result = result.replaceAll("<image([^>]+)>", "<image$1/>");
 
             return result.toCharArray();
         }
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
index 6e38c10d..2394cabd 100644
--- a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
+++ b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
@@ -48,6 +48,8 @@ public class ExportTest {
         final ExportProperties properties = ExportProperties.create(format);
         final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties;
         imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE);
+        String baseUrl = "file://"+svgFile.getParentFile().getAbsolutePath()+"/../../../main/webapp/images";
+        properties.setBaseImagePath(baseUrl);
 
         // Write content ...
         MindMap mindMap = new MindMap();