diff --git a/Makefile b/Makefile
index 76cd289..618f057 100644
--- a/Makefile
+++ b/Makefile
@@ -484,12 +484,14 @@ endif
 	$(SIZE) $(TARGET)
 
 full:
+	$(RM) *.bin
 	$(MAKE) build ENABLE_CHINESE_FULL=0
 	$(MAKE) build ENABLE_CHINESE_FULL=1
 	$(MAKE) build ENABLE_CHINESE_FULL=2
 	$(MAKE) build ENABLE_CHINESE_FULL=3
 	$(MAKE) build ENABLE_CHINESE_FULL=4
 both:
+	$(RM) *.bin
 	$(MAKE) build ENABLE_CHINESE_FULL=0
 	$(MAKE) build ENABLE_CHINESE_FULL=4
 
diff --git a/app/menu.c b/app/menu.c
index 2ee8593..79be216 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -512,7 +512,7 @@ void MENU_AcceptSetting(void) {
 #endif
         case MENU_MEM_NAME:
             // trailing trim
-            for (int i = 9; i >= 0; i--) {
+            for (int i = MAX_EDIT_INDEX-1; i >= 0; i--) {
                 if (edit[i] != ' ' && edit[i] != '_' && edit[i] != 0x00 && edit[i] != 0xff)
                     break;
                 edit[i] = ' ';