diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 7cadd450211096e75bea5c9a9386ae1b82634e6b..4b1666426f65cdda84a43a683a15f41f070be494 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -4405,7 +4405,7 @@ bool EncAppCfg::xCheckParameter()
       msg(WARNING, "Number of frames used for temporal prefilter is different from default.\n");
     }
   }
-#if JVET_Y0240
+#if JVET_Y0077_BIM
   if (m_bimEnabled)
   {
     xConfirmPara(m_temporalSubsampleRatio != 1, "Block Importance Mapping only support Temporal sub-sample ratio 1");
diff --git a/source/Lib/EncoderLib/EncTemporalFilter.cpp b/source/Lib/EncoderLib/EncTemporalFilter.cpp
index 56c8b5209d2bbf9e1ed9c34708acd1bd279bbe71..431eece423a69bf1d80c68f70b7f62da693bf69b 100644
--- a/source/Lib/EncoderLib/EncTemporalFilter.cpp
+++ b/source/Lib/EncoderLib/EncTemporalFilter.cpp
@@ -237,7 +237,7 @@ bool EncTemporalFilter::filter(PelStorage *orgPic, int receivedPoc)
       int* qpMap = new int[m_numCtu];
       for (int poc = bimFirstFrame; poc <= bimLastFrame; poc++)
       {
-        if ((poc < 0) || (poc == currentFilePoc))
+        if ((poc < 0) || (poc == currentFilePoc) || (frameIndex >= numRefs))
         {
           continue; // frame not available or frame that is being filtered
         }