diff --git a/.gitignore b/.gitignore
index 10b8f8514edad98e33e18f6a5a2d106a34768d6a..7ad664d14c87287e05075c5303b9197a36ba2e85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *\#
 .\#*
 *.swp
+builddir\*
diff --git a/db/EMU.substitutions b/db/EMU.substitutions
index c4bfb22b9496e577b531f9cec56a087aaccf6cc0..37f96c63d98ee0de8b05940614a45386968f897c 100644
--- a/db/EMU.substitutions
+++ b/db/EMU.substitutions
@@ -431,7 +431,7 @@ pattern	{DEVICE,DAQPREFIX,DET2WF,DET3WF,DET2,DET3,NELM,SCAN_EF}
 file EMU_BUFF_CHAN.template
 {
 pattern	{DEVICE,SIGNAL,SIGNAL2,NELM,NELM_COMP,SCAN_EF,SCAN_SLIT,MTRREC}
-	{"$(DEVICE)","DET1","CURRENT","10000","80","$(SCAN_EF)","$(SCAN_SLIT)","$(MTRREC)"}
+	{"$(DEVICE)","DET1","CURRENT","900","80","$(SCAN_EF)","$(SCAN_SLIT)","$(MTRREC)"}
 }
 
 
diff --git a/src/EMU_CALCULS.c b/src/EMU_CALCULS.c
index 73c642138a20f3cca88deeda0a7a17769e1d534f..ead5c11c23fc08b0267cf7d4d9ad4b2859fed7ca 100644
--- a/src/EMU_CALCULS.c
+++ b/src/EMU_CALCULS.c
@@ -114,7 +114,7 @@ static int CREATE_TAB(aSubRecord *precord) {
     /***** FILL new DATA ******/
     if(mtr_cpt>0)
     {
-      cpt_for=(mtr_cpt-1);
+      cpt_for=(nbPosition-mtr_cpt);
       ptr_WF_OUT=(float*)(precord->vala);
       ptr_WF_OUT=ptr_WF_OUT+cpt_for;