diff --git a/HISTORY b/HISTORY
index 8705885..5f72bf7 100755
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,6 @@
+Feb. 25 2016
+Fixed a bug with the END and RETURN statement with FOR loop
+
 Feb. 24 2016
 Added a TO_ARRAY statement
 Added support to apply the LEN statement to an array assigned from another
@@ -23,13 +26,13 @@ Added a SYS statement to the shell
 Fixed a wrong list linkage bug with list sorting
 
 Feb. 16 2016
-Fixed a bug of the EXIT statement with FOR loop
+Fixed a bug with the EXIT statement with FOR loop
 
 Feb. 15 2016
 Fixed some compile issues with Xcode
 
 Feb. 11 2016
-Fixed a bug of the EXIT statement with multiple line IF statement
+Fixed a bug with the EXIT statement with multiple line IF statement
 
 Feb. 10 2016
 Fixed a wrong loop bug with WHILE and DO statements
diff --git a/core/my_basic.c b/core/my_basic.c
index 6acba4d..897a726 100755
--- a/core/my_basic.c
+++ b/core/my_basic.c
@@ -9239,6 +9239,8 @@ _to:
 		if(result == MB_LOOP_BREAK) {
 			result = MB_FUNC_OK;
 
+			goto _exit;
+		} else if(result != MB_FUNC_OK && result != MB_SUB_RETURN) {
 			goto _exit;
 		}
 
@@ -9334,6 +9336,8 @@ _to:
 		if(result == MB_LOOP_BREAK) {
 			result = MB_FUNC_OK;
 
+			goto _exit;
+		} else if(result != MB_FUNC_OK && result != MB_SUB_RETURN) {
 			goto _exit;
 		}
 
diff --git a/output/my_basic.exe b/output/my_basic.exe
index 6639367..fca3cb3 100755
Binary files a/output/my_basic.exe and b/output/my_basic.exe differ