diff --git a/src/se/hal/struct/Event.java b/src/se/hal/struct/Event.java
index ef794cf5..82c5dbf6 100755
--- a/src/se/hal/struct/Event.java
+++ b/src/se/hal/struct/Event.java
@@ -54,7 +54,7 @@ public class Event extends AbstractDevice<HalEventConfig,HalEventData>{
 
             if (getId() != null) {
                 PreparedStatement stmt = db.getPreparedStatement(
-                        "SELECT data FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT 1");
+                        "SELECT * FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT 1");
                 stmt.setLong(1, getId());
                 return (HalEventData)
                         DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));
diff --git a/src/se/hal/struct/Sensor.java b/src/se/hal/struct/Sensor.java
index 25bd6fe2..7b1611fd 100755
--- a/src/se/hal/struct/Sensor.java
+++ b/src/se/hal/struct/Sensor.java
@@ -123,7 +123,7 @@ public class Sensor extends AbstractDevice<HalSensorConfig,HalSensorData>{
 
             if (getId() != null) {
                 PreparedStatement stmt = db.getPreparedStatement(
-                        "SELECT data FROM sensor_data_raw WHERE sensor_id == ? ORDER BY timestamp DESC LIMIT 1");
+                        "SELECT * FROM sensor_data_raw WHERE sensor_id == ? ORDER BY timestamp DESC LIMIT 1");
                 stmt.setLong(1, getId());
                 return (HalSensorData)
                         DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));