diff --git a/metrics.go b/metrics.go
index 5343974..f3d237f 100644
--- a/metrics.go
+++ b/metrics.go
@@ -113,7 +113,7 @@ func metricsHandler(response http.ResponseWriter, request *http.Request) {
                                          |> filter(fn: (r) => r._measurement == "measurement") 
                                          |> filter(fn: (r) => r.deveui == "%s")
                                          |> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")
-                                         |> filter(fn: (r) => r.lat != 0`, mystart, mystop, mydeveui))
+                                         |> filter(fn: (r) => r.lat != 0)`, mystart, mystop, mydeveui))
 
 		req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
 		if err != nil {
@@ -428,10 +428,10 @@ func getLastMetrics(deveui string) OneMetric {
 	for scanner.Scan() {
 		s := strings.Split(scanner.Text(), ",")
 		fmt.Printf("BlaBla: %v\n", s)
-		if (len(s) >= 12) && !(strings.HasPrefix(s[5], "_")) {
-			t, err := time.Parse(time.RFC3339, s[5])
+		if (len(s) >= 12) && !(strings.HasPrefix(s[3], "_")) {
+			t, err := time.Parse(time.RFC3339, s[3])
 			if err != nil {
-				fmt.Printf("error converting time: %s\n", s[5])
+				fmt.Printf("error converting time: %s\n", s[3])
 				continue
 			}