diff --git a/sw/lib/flash_ctrl.c b/sw/lib/flash_ctrl.c
index a780a00..0add8c4 100644
--- a/sw/lib/flash_ctrl.c
+++ b/sw/lib/flash_ctrl.c
@@ -60,7 +60,7 @@
 
   // beginning filling up the fifo
   for (i = 0; i < num; i++) {
-    REG32(FLASH_CTRL_PROG_FIFO(FLASH_CTRL0_BASE_ADDR)) = *data;
+    REG32(FLASH_CTRL_PROG_FIFO(0)) = *data;
     data++;
   }
 
@@ -89,7 +89,7 @@
     // if not empty, read a word
     if (((REG32(FLASH_CTRL_STATUS(0)) >> FLASH_CTRL_STATUS_RD_EMPTY) & 0x1) ==
         0) {
-      *data++ = REG32(FLASH_CTRL_RD_FIFO(FLASH_CTRL0_BASE_ADDR));
+      *data++ = REG32(FLASH_CTRL_RD_FIFO(0));
       i++;
     }
   }