diff --git a/hubigraph_time_graph.groovy b/hubigraph_time_graph.groovy
index b407b4a..4791888 100644
--- a/hubigraph_time_graph.groovy
+++ b/hubigraph_time_graph.groovy
@@ -1667,7 +1667,8 @@ def getOverlay(){
     val.each{ str->
         splitStr = str.split('_');
         deviceId = splitStr[1];
-        attribute = splitStr[2];
+        attribute = str[(splitStr[0]?.size() + splitStr[1]?.size() + 2)-str.size()..-1]
+
     
         sensor = sensors.find{ it.id == deviceId } ;