diff --git a/mote/v2/openwrt/package/flukso/luasrc/fluksod.lua b/mote/v2/openwrt/package/flukso/luasrc/fluksod.lua
index 25f043a..aa4c3c9 100755
--- a/mote/v2/openwrt/package/flukso/luasrc/fluksod.lua
+++ b/mote/v2/openwrt/package/flukso/luasrc/fluksod.lua
@@ -141,7 +141,7 @@ end
 function wan_buffer(child)
 	return coroutine.create(function(sensor_id, timestamp, counter)
 		local measurements = data.new()
-		local threshold = timestamp + WAN_INTERVAL
+		local threshold = os.time() + WAN_INTERVAL
 		local previous = {}
 
 		while true do
@@ -166,7 +166,7 @@ function wan_buffer(child)
 
 			if timestamp > threshold and next(measurements) then  --checking whether table is not empty
 				coroutine.resume(child, measurements)
-				threshold = timestamp + WAN_INTERVAL
+				threshold = os.time() + WAN_INTERVAL
 			end
 
 			sensor_id, timestamp, counter = coroutine.yield()