diff --git a/Control/firmware/Bootloader/main.c b/Control/firmware/Bootloader/main.c
index 2111664..ba1db2e 100644
--- a/Control/firmware/Bootloader/main.c
+++ b/Control/firmware/Bootloader/main.c
@@ -94,7 +94,7 @@ int main(void)
 	cli();
 	if (is_bsel())
 	{
-		bootloader_enter();
+	bootloader_enter();
 		led_bsel(1);
 		uart_init(115200);
 		uart_puts("Hendi-Control Bootloader v1.2\n");
@@ -227,10 +227,11 @@ int main(void)
 				state = state_next;
 			}
 		} while (!leave_loop);
-		uart_puts("Exit bootloader!\n\n");
-		bootloader_exit();
+		
+		// After flash update: Without RWW section enable, jump to app will fail
+		boot_rww_enable();
 	}
-
+	bootloader_exit();
 
 	/* Return to address 0x0000 */
 	startApplication();
@@ -238,7 +239,6 @@ int main(void)
 
 void erase_page(uint16_t page_addr)
 {
-//	uart_puts("ErasePage: "); print_word(page_addr); uart_puts("\n");
 	eeprom_busy_wait ();
 	boot_spm_busy_wait ();
 	boot_page_erase (page_addr);
@@ -248,7 +248,6 @@ void write_page(uint16_t page_addr, uint8_t *pPageBuffer)
 {
 	uint16_t i;
 
-//	uart_puts("Write page 0x"); print_word(page_addr); uart_puts("\n");
 	boot_spm_busy_wait ();      /* Wait until the memory is erased. */
 	
 	for (i=0; i<SPM_PAGESIZE; i+=2)