diff --git a/addons/GearSwap/packet_parsing.lua b/addons/GearSwap/packet_parsing.lua
index 0dba6a1b6..410ea7613 100644
--- a/addons/GearSwap/packet_parsing.lua
+++ b/addons/GearSwap/packet_parsing.lua
@@ -186,8 +186,8 @@ parse.i[0x037] = function (data)
         end
     end]]
     -- Info provided by Akaden
-    vana_offset = os.time() - (((data:unpack("I",0x41)*60 + data:unpack("I",0x37)) % 0x100000000) / 60)
-    
+    vana_offset = os.time() - (((data:unpack("I",0x41)*60 - data:unpack("I",0x3D)) % 0x100000000) / 60)
+
     local indi_byte = data:byte(0x59)
     if indi_byte%128/64 >= 1 then
         local temp_indi = _ExtraData.player.indi
@@ -459,7 +459,7 @@ parse.i[0x063] = function (data)
         for i=1,32 do
             local buff_id = data:unpack('H',i*2+7)
             if buff_id ~= 255 and buff_id ~= 0 then -- 255 is used for "no buff"
-                local t = data:unpack('I',i*4+0x45)/60 + vana_offset
+                local t = data:unpack('I',i*4+0x45)/60
                 newbuffs[i] = setmetatable({
                     name=res.buffs[buff_id].name,
                     buff=copy_entry(res.buffs[buff_id]),
@@ -469,7 +469,7 @@ parse.i[0x063] = function (data)
                     },
                     {__index=function(t,k)
                         if k and k=='duration' then
-                            return rawget(t,'time')-os.time()
+                            return rawget(t,'time')-os.time()+(vana_offset or 0)
                         else
                             return rawget(t,k)
                         end