device address is now properly set when address is generated for the first time
diff --git a/src/part2/examples/local/apps/monitor/mon_ED.c b/src/part2/examples/local/apps/monitor/mon_ED.c
index 5c8f204..7ac423f 100644
--- a/src/part2/examples/local/apps/monitor/mon_ED.c
+++ b/src/part2/examples/local/apps/monitor/mon_ED.c
@@ -51,17 +51,16 @@
         }
     }
 
-    lAddr.addr[0] = FLASH_ADDR[0];
-    lAddr.addr[1] = FLASH_ADDR[1];
-    lAddr.addr[2] = FLASH_ADDR[2];
-    lAddr.addr[3] = FLASH_ADDR[3];
-
     if (FLASH_ADDR[0] == 0xFF && 
         FLASH_ADDR[1] == 0xFF && 
         FLASH_ADDR[2] == 0xFF && 
         FLASH_ADDR[3] == 0xFF) {
         createRandomAddress();  /* set Random device address at startup */
     }
+    lAddr.addr[0] = FLASH_ADDR[0];
+    lAddr.addr[1] = FLASH_ADDR[1];
+    lAddr.addr[2] = FLASH_ADDR[2];
+    lAddr.addr[3] = FLASH_ADDR[3];
 
     BCSCTL1 = CALBC1_8MHZ;      /* Set DCO after random function */
     DCOCTL = CALDCO_8MHZ;