diff --git a/src/main/tjava/com/fanitas/evelyn/core/impl/ref/DesiredPositionCalculatorImpl.tjava b/src/main/tjava/com/fanitas/evelyn/core/impl/ref/DesiredPositionCalculatorImpl.tjava
index 5f30ecc..a298c1d 100644
--- a/src/main/tjava/com/fanitas/evelyn/core/impl/ref/DesiredPositionCalculatorImpl.tjava
+++ b/src/main/tjava/com/fanitas/evelyn/core/impl/ref/DesiredPositionCalculatorImpl.tjava
@@ -88,15 +88,22 @@ public class DesiredPositionCalculatorImpl implements DesiredPositionCalculator
         }
 
         // TODO: This smells - setting to null. Oh dear!
-        CurrencyType ct = null;
+        CurrencyType ctA = null;
+        ΩAmountΩ amountA = ZERO;
+        CurrencyType ctB = null;
         ΩAmountΩ amountB = ZERO;
+
         for (RaydiumLiquidityPoolPositionConcentrated position : liquidityProviderPositions.values()) {
-            ct = position.amountMintB().currencyType(); // TODO: Too redundant - please rethink
+            ctA = position.amountMintA().currencyType(); // TODO: Too redundant - please rethink
+            amountA = amountA.add(position.accountingInfo().addedMintA());
+            ctB = position.amountMintB().currencyType(); // TODO: Too redundant - please rethink
             amountB = amountB.add(position.accountingInfo().addedMintB());
         }
 
-        MoneyAmount ma = new MoneyAmount(amountB, ct);
-        return new Pair(ZERO, ma);
+        MoneyAmount ma = new MoneyAmount(amountA, ctA);
+        MoneyAmount mb = new MoneyAmount(amountB, ctB);
+
+        return new Pair(ma, mb);
     }
 
     @Override