diff --git a/HISTORY b/HISTORY
index 4e4b545..288855b 100755
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,6 @@
+May. 17 2017
+Fixed a forked structure disposing issue if error occurs
+
 May. 15 2017
 Added mb_get_gc_enabled and mb_set_gc_enabled functions
 
diff --git a/core/my_basic.c b/core/my_basic.c
index b3ffd9a..deeaf49 100755
--- a/core/my_basic.c
+++ b/core/my_basic.c
@@ -11467,9 +11467,8 @@ int mb_close_forked(struct mb_interpreter_t** s) {
 
 	src = *s;
 	while(mb_get_forked_from(src, &src) == MB_FUNC_OK) { /* Do nothing */ }
-	if(!src->valid)
-		(*s)->running_context = (*s)->forked_context;
-	(*s)->running_context->prev = 0;
+	(*s)->forked_context->prev = 0;
+	(*s)->running_context = (*s)->forked_context;
 	_dispose_scope_chain(*s);
 
 	_ls_foreach((*s)->edge_destroy_objects, _destroy_object);