diff --git a/data/testing__swaps_intermediate_meteora.csv b/data/testing__swaps_intermediate_meteora.csv
index 5a224b63..287053e1 100644
--- a/data/testing__swaps_intermediate_meteora.csv
+++ b/data/testing__swaps_intermediate_meteora.csv
@@ -9,4 +9,10 @@ NfvsjHzJx5s5JWDK7pJaWUv7hXJGdWUYwqaoRVLxQ2d5q3Jyrs2uft9FUyeNFVyxVSVZFPdsTv45dpgd
 2eV5PUm4WL7X9T1X4nSbBmAGDLTx9pUiygK34ngMSyR9QwQUS8ZpnzGKTCbuJHeVGYNHjHBGtPh4fLYxkBLGVJeB,BQ72nSv9f3PRyRKCBnHLVrerrv37CYTHm5h3s9VSGQDV,40.176596896,9TVjnzpF3X8DHsfVqYWoCGphJxtGYh1PDCFN5QmsHW5t,0.838353755,So11111111111111111111111111111111111111112,2
 2eV5PUm4WL7X9T1X4nSbBmAGDLTx9pUiygK34ngMSyR9QwQUS8ZpnzGKTCbuJHeVGYNHjHBGtPh4fLYxkBLGVJeB,BQ72nSv9f3PRyRKCBnHLVrerrv37CYTHm5h3s9VSGQDV,10,EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v,0.00026839,3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh,3
 35QkSCVWRNFaqFM8DZrDWKWsBdDTrHVMmskd3H9D3pcQstdYsWqZiXVhMpkaCFrBQTi8XZaWgNZaWnQZzwPpZ1dv,6U91aKa8pmMxkJwBCfPTmUEfZi6dHe7DcFq2ALvB2tbB,5.226666,EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v,2993956.3575,DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263,1
-35QkSCVWRNFaqFM8DZrDWKWsBdDTrHVMmskd3H9D3pcQstdYsWqZiXVhMpkaCFrBQTi8XZaWgNZaWnQZzwPpZ1dv,6U91aKa8pmMxkJwBCfPTmUEfZi6dHe7DcFq2ALvB2tbB,0.027582317,So11111111111111111111111111111111111111112,747886.05184,DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263,2
\ No newline at end of file
+35QkSCVWRNFaqFM8DZrDWKWsBdDTrHVMmskd3H9D3pcQstdYsWqZiXVhMpkaCFrBQTi8XZaWgNZaWnQZzwPpZ1dv,6U91aKa8pmMxkJwBCfPTmUEfZi6dHe7DcFq2ALvB2tbB,0.027582317,So11111111111111111111111111111111111111112,747886.05184,DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263,2
+64PW2o1TjxU3kJXAWsAZrL6wJAhKeAY2esJNbjp9UfBb4q4mZMF9KdXXqv3DjkAiNZUacitwzU5v8rCCb3zkdvmp,GX9nfVpdZ9eHpcPTDCCf5zaJr9MoVQNGpAywYMuTtGvU,0.012,So11111111111111111111111111111111111111112,1.981789,EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v,1
+64PW2o1TjxU3kJXAWsAZrL6wJAhKeAY2esJNbjp9UfBb4q4mZMF9KdXXqv3DjkAiNZUacitwzU5v8rCCb3zkdvmp,GX9nfVpdZ9eHpcPTDCCf5zaJr9MoVQNGpAywYMuTtGvU,1.981789,EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v,1819.744499,9LAjk5F4rFetELE4CygcBbZ5hYc2QhRrbJjfm5Q26jWM,2
+2CkwiLBE82MALvqW4uHscPLbEdAqgVXhSPsmoeVPq6wzS9iTv1wDfwsE7SBqoR6j7L2KFyi2NMwAy5Yq5a45RuVy,BRentiWgeVVNtzMxgJwR9GhMkozjuYiFCCDuMaSS9o2,0.005,So11111111111111111111111111111111111111112,0.61371687,TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6,1
+2CkwiLBE82MALvqW4uHscPLbEdAqgVXhSPsmoeVPq6wzS9iTv1wDfwsE7SBqoR6j7L2KFyi2NMwAy5Yq5a45RuVy,BRentiWgeVVNtzMxgJwR9GhMkozjuYiFCCDuMaSS9o2,0.61371687,TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6,1.278914,85VBFQZC9TZkfaptBWjvUw7YbZjy52A6mjtPGjstQAmQ,2
+2CkwiLBE82MALvqW4uHscPLbEdAqgVXhSPsmoeVPq6wzS9iTv1wDfwsE7SBqoR6j7L2KFyi2NMwAy5Yq5a45RuVy,BRentiWgeVVNtzMxgJwR9GhMkozjuYiFCCDuMaSS9o2,1.278914,85VBFQZC9TZkfaptBWjvUw7YbZjy52A6mjtPGjstQAmQ,0.761483,JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN,3
+2CkwiLBE82MALvqW4uHscPLbEdAqgVXhSPsmoeVPq6wzS9iTv1wDfwsE7SBqoR6j7L2KFyi2NMwAy5Yq5a45RuVy,BRentiWgeVVNtzMxgJwR9GhMkozjuYiFCCDuMaSS9o2,0.761483,JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN,0.005011026,So11111111111111111111111111111111111111112,4
\ No newline at end of file
diff --git a/models/silver/swaps/meteora/silver__swaps_intermediate_meteora.sql b/models/silver/swaps/meteora/silver__swaps_intermediate_meteora.sql
index cb43667d..6805c9e8 100644
--- a/models/silver/swaps/meteora/silver__swaps_intermediate_meteora.sql
+++ b/models/silver/swaps/meteora/silver__swaps_intermediate_meteora.sql
@@ -57,9 +57,6 @@ decoded AS (
         tx_id,
         INDEX,
         inner_index,
-        COALESCE(LEAD(inner_index) OVER (PARTITION BY tx_id, index 
-            ORDER BY inner_index) -1, 999999
-        ) AS inner_index_end,
         program_id,
         silver.udf_get_account_pubkey_by_name(
             'user',
@@ -101,10 +98,6 @@ decoded AS (
         tx_id,
         INDEX,
         inner_index,
-        COALESCE(LEAD(inner_index) OVER (PARTITION BY tx_id, index 
-            ORDER BY
-            inner_index) -1, 999999
-        ) AS inner_index_end,
         program_id,
         silver.udf_get_account_pubkey_by_name(
             'user',
@@ -138,6 +131,14 @@ decoded AS (
             OR decoded_instruction :args :inAmount :: INT <> 0
         )
 ),
+decoded_w_index_range as (
+select *,
+        COALESCE(LEAD(inner_index) OVER (PARTITION BY tx_id, index 
+            ORDER BY
+            inner_index) -1, 999999
+        ) AS inner_index_end
+from decoded
+),
 transfers AS (
     SELECT
         A.*,
@@ -191,7 +192,7 @@ pre_final AS (
         ) AS to_mint,
         A._inserted_timestamp
     FROM
-        decoded A
+        decoded_w_index_range A
         LEFT JOIN transfers b
         ON A.tx_id = b.tx_id
         AND A.source_token_account = b.source_token_account
diff --git a/models/silver/swaps/meteora/silver__swaps_intermediate_meteora.yml b/models/silver/swaps/meteora/silver__swaps_intermediate_meteora.yml
index 18a99eee..808ad503 100644
--- a/models/silver/swaps/meteora/silver__swaps_intermediate_meteora.yml
+++ b/models/silver/swaps/meteora/silver__swaps_intermediate_meteora.yml
@@ -24,7 +24,9 @@ models:
           'iBuwG5mU4LKMrN6iNVzGZSC7vXqvAfRQ98YJeKXPoDbM2oi7dvV8ZMnwgv55Db6JT4iokQ6JbVpN7jHnKkFtJqC',
           'NfvsjHzJx5s5JWDK7pJaWUv7hXJGdWUYwqaoRVLxQ2d5q3Jyrs2uft9FUyeNFVyxVSVZFPdsTv45dpgdog9RyzQ',
           '2eV5PUm4WL7X9T1X4nSbBmAGDLTx9pUiygK34ngMSyR9QwQUS8ZpnzGKTCbuJHeVGYNHjHBGtPh4fLYxkBLGVJeB',
-          '35QkSCVWRNFaqFM8DZrDWKWsBdDTrHVMmskd3H9D3pcQstdYsWqZiXVhMpkaCFrBQTi8XZaWgNZaWnQZzwPpZ1dv')"  
+          '35QkSCVWRNFaqFM8DZrDWKWsBdDTrHVMmskd3H9D3pcQstdYsWqZiXVhMpkaCFrBQTi8XZaWgNZaWnQZzwPpZ1dv',
+          '2CkwiLBE82MALvqW4uHscPLbEdAqgVXhSPsmoeVPq6wzS9iTv1wDfwsE7SBqoR6j7L2KFyi2NMwAy5Yq5a45RuVy',
+          '64PW2o1TjxU3kJXAWsAZrL6wJAhKeAY2esJNbjp9UfBb4q4mZMF9KdXXqv3DjkAiNZUacitwzU5v8rCCb3zkdvmp')"  
     columns:
       - name: BLOCK_TIMESTAMP
         description: "{{ doc('block_timestamp') }}"