diff --git a/vlib/v/gen/cgen.v b/vlib/v/gen/cgen.v
index 5de884f8e3..06946750d2 100644
--- a/vlib/v/gen/cgen.v
+++ b/vlib/v/gen/cgen.v
@@ -1058,7 +1058,7 @@ fn (mut g Gen) stmt(node ast.Stmt) {
 					g.writeln('//af tmp')
 					// g.autofree_call_pregen(node.exprs[0] as ast.CallExpr)
 				}
-				// g.autofree_scope_vars(node.pos.pos - 1)
+				g.autofree_scope_vars(node.pos.pos - 1, 0)
 				g.writeln('// ast.Return free_end')
 				// g.write_autofree_stmts_when_needed(node)
 			}
@@ -2117,7 +2117,7 @@ fn (mut g Gen) autofree_scope_vars2(scope &ast.Scope, start_pos int, end_pos int
 	if !isnil(scope.parent) {
 		// g.autofree_scope_vars2(scope.parent, end_pos)
 		g.writeln('// af parent scope:')
-		// g.autofree_scope_vars2(scope.parent, start_pos, end_pos, line_nr)
+		g.autofree_scope_vars2(scope.parent, start_pos, end_pos, line_nr)
 	}
 }
 
diff --git a/vlib/v/tests/valgrind/1.strings_and_arrays.v b/vlib/v/tests/valgrind/1.strings_and_arrays.v
index 6e89ed5664..78eefb1e3b 100644
--- a/vlib/v/tests/valgrind/1.strings_and_arrays.v
+++ b/vlib/v/tests/valgrind/1.strings_and_arrays.v
@@ -274,7 +274,7 @@ fn main() {
 	q := if_expr()
 	s := return_if_expr()
 	free_inside_opt_block()
-	// free_before_return()
+	free_before_return()
 	// free_before_return_bool()
 	// free_map()
 	// loop_map()