diff --git a/source/Lib/CommonLib/IntraPrediction.cpp b/source/Lib/CommonLib/IntraPrediction.cpp
index 2a3a095a95edcdbca538624c46900f6a446c2845..f41ef9f7a902b5fc0063583ea38222f3ceed3b39 100644
--- a/source/Lib/CommonLib/IntraPrediction.cpp
+++ b/source/Lib/CommonLib/IntraPrediction.cpp
@@ -2776,9 +2776,9 @@ void IntraPrediction::predIntraAng( const ComponentID compId, PelBuf &piPred, co
     m_ipaParam = m_ipaParam2;
 
 #if JVET_AJ0107_GPM_SHAPE_ADAPT
-    int     splitDir = g_sgpmSplitDir[pu.cu->sgpmSplitDir];
+    int     splitDir   = g_sgpmSplitDir[pu.cu->sgpmSplitDir];
 #else
-    int     splitDir = pu.cu->sgpmSplitDir;
+    int     splitDir   = pu.cu->sgpmSplitDir;
 #endif
 #if JVET_AJ0112_REGRESSION_SGPM
     if (PU::isRegressionSgpm(pu))
diff --git a/source/Lib/EncoderLib/EncCu.cpp b/source/Lib/EncoderLib/EncCu.cpp
index 8c5feb3beb5abe2af591fd3ed05a1704778b3ba6..c92e34e27361b760a3929dc26c1d7e65233f1c44 100644
--- a/source/Lib/EncoderLib/EncCu.cpp
+++ b/source/Lib/EncoderLib/EncCu.cpp
@@ -15073,8 +15073,13 @@ void EncCu::xCheckRDCostMergeGeoComb2Nx2N(CodingStructure *&tempCS, CodingStruct
         if (tmFlag0)
         {
 #if JVET_AA0058_GPM_ADAPTIVE_BLENDING
+#if JVET_AJ0107_GPM_SHAPE_ADAPT
+          m_pcInterSearch->weightedGeoBlkRounded(pu, g_gpmSplitDir[whIdx][splitDir], bldIdx, CHANNEL_TYPE_LUMA, geoCombinations[geoCombIdx], predSrcTemp0, predSrcTemp1);
+          m_pcInterSearch->weightedGeoBlkRounded(pu, g_gpmSplitDir[whIdx][splitDir], bldIdx, CHANNEL_TYPE_CHROMA, geoCombinations[geoCombIdx], predSrcTemp0, predSrcTemp1);
+#else
           m_pcInterSearch->weightedGeoBlkRounded(pu, splitDir, bldIdx, CHANNEL_TYPE_LUMA, geoCombinations[geoCombIdx], predSrcTemp0, predSrcTemp1);
           m_pcInterSearch->weightedGeoBlkRounded(pu, splitDir, bldIdx, CHANNEL_TYPE_CHROMA, geoCombinations[geoCombIdx], predSrcTemp0, predSrcTemp1);
+#endif
 #else
           m_pcInterSearch->weightedGeoBlkRounded(pu, splitDir, CHANNEL_TYPE_LUMA, geoCombinations[candidateIdx], predSrc0, predSrc1);
           m_pcInterSearch->weightedGeoBlkRounded(pu, splitDir, CHANNEL_TYPE_CHROMA, geoCombinations[candidateIdx], predSrc0, predSrc1);