diff --git a/contracts/strategies/ShortStrategy.sol b/contracts/strategies/ShortStrategy.sol
index f8bc185..410a0ab 100644
--- a/contracts/strategies/ShortStrategy.sol
+++ b/contracts/strategies/ShortStrategy.sol
@@ -61,7 +61,7 @@ abstract contract ShortStrategy is IShortStrategy, BaseStrategy {
     function getLatestBalances(uint256 lastFeeIndex, uint256 borrowedInvariant, uint256 lpBalance, uint256 lastCFMMInvariant, uint256 lastCFMMTotalSupply) public virtual override view
         returns(uint256 lastLPBalance, uint256 lastBorrowedLPBalance, uint256 lastBorrowedInvariant) {
         lastBorrowedInvariant = accrueBorrowedInvariant(borrowedInvariant, lastFeeIndex);
-        lastBorrowedLPBalance =  convertInvariantToLPRoundUp(lastBorrowedInvariant, lastCFMMTotalSupply, lastCFMMInvariant);
+        lastBorrowedLPBalance = convertInvariantToLPRoundUp(lastBorrowedInvariant, lastCFMMTotalSupply, lastCFMMInvariant);
         lastLPBalance = lpBalance + lastBorrowedLPBalance;
     }
 
diff --git a/contracts/strategies/base/BaseBorrowStrategy.sol b/contracts/strategies/base/BaseBorrowStrategy.sol
index 4ae0dce..86923ae 100644
--- a/contracts/strategies/base/BaseBorrowStrategy.sol
+++ b/contracts/strategies/base/BaseBorrowStrategy.sol
@@ -130,8 +130,8 @@ abstract contract BaseBorrowStrategy is BaseLongStrategy {
         uint256 lpInvariant = convertLPToInvariant(lpTokenBalance, lastCFMMInvariant, lastCFMMTotalSupply);
         s.LP_INVARIANT = uint128(lpInvariant);
 
-        // Add CFMM LP tokens borrowed (principal) plus origination fee to pool's total CFMM LP tokens borrowed including accrued interest
-        s.LP_TOKEN_BORROWED_PLUS_INTEREST = s.LP_TOKEN_BORROWED_PLUS_INTEREST + lpTokens + lpTokenOrigFee;
+        // convert borrowedInvariant including origination fee and accrued interest to CFMM LP tokens
+        s.LP_TOKEN_BORROWED_PLUS_INTEREST = convertInvariantToLPRoundUp(borrowedInvariant, lastCFMMTotalSupply, lastCFMMInvariant);
 
         liquidity = liquidity + liquidityBorrowed;
         if(liquidity < initLiquidity) revert MinBorrow();
diff --git a/package.json b/package.json
index d1bcd6d..6192164 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gammaswap/v1-core",
-  "version": "1.2.15",
+  "version": "1.2.16",
   "description": "Core smart contracts for the GammaSwap V1 protocol",
   "homepage": "https://gammaswap.com",
   "scripts": {