diff --git a/source/Lib/CommonLib/RdCost.h b/source/Lib/CommonLib/RdCost.h
index d5325ff578a032e26d03f01880b548f8394ba8d5..807fbae0b295d2b2a0f103e472fab38b05025614 100644
--- a/source/Lib/CommonLib/RdCost.h
+++ b/source/Lib/CommonLib/RdCost.h
@@ -233,7 +233,7 @@ public:
   { 
     return &m_cBvdBitCosts; 
   }
-#if JVET_Z0084_IBC_TM
+#if JVET_Z0084_IBC_TM && TM_AMVP
   inline Distortion getBvCostMultiplePreds(int x, int y, bool useIMV, uint8_t *bvImvResBest = NULL, int *bvpIdxBest = NULL, bool flag = false, AMVPInfo* amvpInfo4Pel = NULL)
 #else
   inline Distortion getBvCostMultiplePreds(int x, int y, bool useIMV, uint8_t *bvImvResBest = NULL, int *bvpIdxBest = NULL)
@@ -259,7 +259,7 @@ public:
     if (bestRes && x % 4 == 0 && y % 4 == 0)
     {
       Mv cMv(x >> 2, y >> 2);
-#if JVET_Z0084_IBC_TM
+#if JVET_Z0084_IBC_TM && TM_AMVP
       Mv tmpBv0;
       Mv tmpBv1;
       if (flag) 
diff --git a/source/Lib/EncoderLib/InterSearch.cpp b/source/Lib/EncoderLib/InterSearch.cpp
index 465cb2619893768fb7c6fc5525fef68cf09aaa57..604a377e7ef3c08b54f80a8eb197ac8e39771c97 100644
--- a/source/Lib/EncoderLib/InterSearch.cpp
+++ b/source/Lib/EncoderLib/InterSearch.cpp
@@ -1687,7 +1687,7 @@ bool InterSearch::predIBCSearch(CodingUnit& cu, Partitioner& partitioner, const
 #if JVET_Z0131_IBC_BVD_BINARIZATION
     m_pcRdCost->setPredictors(cMvPred);
     m_pcRdCost->setCostScale(0);
-#if JVET_Z0084_IBC_TM
+#if JVET_Z0084_IBC_TM && TM_AMVP
     m_pcRdCost->getBvCostMultiplePreds(cMv.getHor(), cMv.getVer(), pu.cs->sps->getAMVREnabledFlag(), &pu.cu->imv, &bvpIdxBest, true, &amvpInfo4Pel);
 #else
     m_pcRdCost->getBvCostMultiplePreds(cMv.getHor(), cMv.getVer(), pu.cs->sps->getAMVREnabledFlag(), &pu.cu->imv, &bvpIdxBest);