diff --git a/src/csvdata b/src/csvdata
index c820a58..02ba983 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit c820a5807bf24a342c40fcbb5def8a31899cc664
+Subproject commit 02ba983a6b9e4b0345a8c5bebc3657976c18514a
diff --git a/src/models/Activity.lua b/src/models/Activity.lua
index 2520ffd..3b6325c 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -490,14 +490,14 @@ activityFunc[Activity.ActivityType.Exchange] = {
 		if not cfg then return end
 		local refreshTimes = cfg.condition2:toArray(false, "=")
 		for i = 1, #refreshTimes do
-			local rt = toUnixtime(refreshTimes[1]..string_format("%02x", RESET_TIME))
+			local rt = toUnixtime(refreshTimes[i]..string_format("%02x", RESET_TIME))
 			if timeNow >= rt and rt > lastTs then
 				lastTs = rt
 				actData = {}
 			end
 		end
-		if next(actData) then
-			actData["ts"] = lastTs
+		if not next(actData) then
+			actData["ts"] = timeNow
 			self:updateActData(actType, actData, not notify)
 		end
 	end,
--
libgit2 0.21.2