diff --git a/source/Lib/CommonLib/Picture.cpp b/source/Lib/CommonLib/Picture.cpp
index 6c70229843a6d9c5f2cd453cd72344cd4e754d64..77d3822e10ffb435f6fa78a9f8dadf54f28fe628 100644
--- a/source/Lib/CommonLib/Picture.cpp
+++ b/source/Lib/CommonLib/Picture.cpp
@@ -398,11 +398,11 @@ const CPelUnitBuf Picture::getRecBeforeDbfBuf(const UnitArea &unit) const { retu
 
 
 #if NNVC_USE_REC_AFTER_DBF
-PelBuf     Picture::getRecAfterDbfBuf(const ComponentID compID, bool /*wrap*/)       { return getBuf(compID,               PIC_REC_AFTER_DBF); }
-PelUnitBuf Picture::getRecAfterDbfBuf(bool /*wrap*/)                                 { return M_BUFS(scheduler.getSplitPicId(), PIC_REC_AFTER_DBF); }
-PelBuf     Picture::getRecAfterDbfBuf(const CompArea &blk)        { return getBuf(blk,  PIC_REC_AFTER_DBF); }
+       PelBuf     Picture::getRecAfterDbfBuf(const ComponentID compID, bool /*wrap*/)       { return getBuf(compID,               PIC_REC_AFTER_DBF); }
+       PelUnitBuf Picture::getRecAfterDbfBuf(bool /*wrap*/)                                 { return M_BUFS(scheduler.getSplitPicId(), PIC_REC_AFTER_DBF); }
+       PelBuf     Picture::getRecAfterDbfBuf(const CompArea &blk)        { return getBuf(blk,  PIC_REC_AFTER_DBF); }
 const CPelBuf     Picture::getRecAfterDbfBuf(const CompArea &blk)  const { return getBuf(blk,  PIC_REC_AFTER_DBF); }
-PelUnitBuf Picture::getRecAfterDbfBuf(const UnitArea &unit)       { return getBuf(unit, PIC_REC_AFTER_DBF); }
+       PelUnitBuf Picture::getRecAfterDbfBuf(const UnitArea &unit)       { return getBuf(unit, PIC_REC_AFTER_DBF); }
 const CPelUnitBuf Picture::getRecAfterDbfBuf(const UnitArea &unit) const { return getBuf(unit, PIC_REC_AFTER_DBF);}
 #endif
 
diff --git a/source/Lib/CommonLib/Picture.h b/source/Lib/CommonLib/Picture.h
index d4776fae50b2feb95c1fbd014ad984a7321019b1..b2c6b1236c5580911951cbee46aa448fdbc35b34 100644
--- a/source/Lib/CommonLib/Picture.h
+++ b/source/Lib/CommonLib/Picture.h
@@ -159,11 +159,11 @@ const   CPelBuf     getBsMapBuf(const CompArea &blk) const;
   const CPelUnitBuf getPredBufCustom(const UnitArea &unit) const;
 #endif
 #if NNVC_USE_REC_BEFORE_DBF
-  PelBuf     getRecBeforeDbfBuf(const ComponentID compID, bool wrap=false);
-  PelUnitBuf getRecBeforeDbfBuf(bool wrap=false);
-  PelBuf     getRecBeforeDbfBuf(const CompArea &blk);
+  PelBuf            getRecBeforeDbfBuf(const ComponentID compID, bool wrap=false);
+  PelUnitBuf        getRecBeforeDbfBuf(bool wrap=false);
+  PelBuf            getRecBeforeDbfBuf(const CompArea &blk);
   const CPelBuf     getRecBeforeDbfBuf(const CompArea &blk)  const;
-  PelUnitBuf getRecBeforeDbfBuf(const UnitArea &unit);
+  PelUnitBuf        getRecBeforeDbfBuf(const UnitArea &unit);
   const CPelUnitBuf getRecBeforeDbfBuf(const UnitArea &unit) const;
 #endif
 #if NNVC_USE_REC_AFTER_DBF
diff --git a/source/Lib/EncoderLib/EncSlice.cpp b/source/Lib/EncoderLib/EncSlice.cpp
index 5ac56442f3ca24529e1ad0fe3846725e12b64554..babb8b516f33e7a4e0b781abfeac4768e4437609 100644
--- a/source/Lib/EncoderLib/EncSlice.cpp
+++ b/source/Lib/EncoderLib/EncSlice.cpp
@@ -1804,6 +1804,10 @@ void EncSlice::encodeCtus( Picture* pcPic, const bool bCompressEntireSlice, cons
     }
   }
 
+#if NNVC_USE_PARTITION_AS_CU_AVERAGE
+  pcPic->dumpPicCuAverage();
+#endif
+  
   // this is wpp exclusive section
 
 //  m_uiPicTotalBits += actualBits;