diff --git a/.hgsubstate b/.hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,2 +1,2 @@
 3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
-6bab694410c69700e3455ffba21ce58dbb4da870 header/lfr_common_headers
+d4a9a4d748d56d86427bfe03a6777fae4cfe3ae1 header/lfr_common_headers
diff --git a/python_scripts/00_LFRControlPlugin_reload_fsw.py b/python_scripts/00_LFRControlPlugin_reload_fsw.py
--- a/python_scripts/00_LFRControlPlugin_reload_fsw.py
+++ b/python_scripts/00_LFRControlPlugin_reload_fsw.py
@@ -1,7 +1,7 @@
 # LOAD FSW USING LINK 1
 SpwPlugin0.StarDundeeSelectLinkNumber( 1 )
 
-dsu3plugin0.openFile("/home/pleroy/DEV/DEV_PLE/build-DEV_PLE-Desktop-Default/src/fsw")
+dsu3plugin0.openFile("/home/pleroy/DEV/build-DEV_PLE-Desktop-Default/src/fsw")
 #dsu3plugin0.openFile("/opt/LFR/LFR-FSW/2.0.2.3/fsw")
 dsu3plugin0.loadFile()
 
diff --git a/src/processing/avf0_prc0.c b/src/processing/avf0_prc0.c
--- a/src/processing/avf0_prc0.c
+++ b/src/processing/avf0_prc0.c
@@ -90,7 +90,7 @@ rtems_task avf0_task( rtems_task_argumen
         for ( i = 1; i < (NB_SM_BEFORE_AVF0_F1); i++ )
         {
             nodeForAveraging = nodeForAveraging->previous;
-            ring_node_tab[NB_SM_BEFORE_AVF0_F1-i] = nodeForAveraging;
+            ring_node_tab[NB_SM_BEFORE_AVF0_F1 - i - 1] = nodeForAveraging;
         }
 
         // compute the average and store it in the averaged_sm_f1 buffer
diff --git a/src/processing/avf1_prc1.c b/src/processing/avf1_prc1.c
--- a/src/processing/avf1_prc1.c
+++ b/src/processing/avf1_prc1.c
@@ -91,7 +91,7 @@ rtems_task avf1_task( rtems_task_argumen
         for ( i = 1; i < (NB_SM_BEFORE_AVF0_F1); i++ )
         {
             nodeForAveraging = nodeForAveraging->previous;
-            ring_node_tab[NB_SM_BEFORE_AVF0_F1-i] = nodeForAveraging;
+            ring_node_tab[NB_SM_BEFORE_AVF0_F1 - i - 1] = nodeForAveraging;
         }
 
         // compute the average and store it in the averaged_sm_f1 buffer