diff --git a/src/se/hal/page/MapHttpPage.java b/src/se/hal/page/MapHttpPage.java
index 47403308..2cf24eb0 100755
--- a/src/se/hal/page/MapHttpPage.java
+++ b/src/se/hal/page/MapHttpPage.java
@@ -112,7 +112,7 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage
         DataNode sensorsNode = new DataNode(DataNode.DataType.List);
         for (Sensor sensor : Sensor.getLocalSensors(db)) {
             DataNode sensorNode = getDeviceNode(sensor);
-            sensorNode.set("data", sensor.getDeviceData().getData());
+            sensorNode.set("data", ""+sensor.getDeviceData());
             sensorsNode.add(sensorNode);
         }
         root.set("sensors", sensorsNode);
@@ -120,7 +120,7 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage
         DataNode eventsNode = new DataNode(DataNode.DataType.List);
         for (Event event : Event.getLocalEvents(db)) {
             DataNode eventNode = getDeviceNode(event);
-            eventNode.set("data", event.getDeviceData().getData());
+            eventNode.set("data", ""+event.getDeviceData());
             eventsNode.add(eventNode);
         }
         root.set("events", eventsNode);