--- parser3/src/classes/op.C	2016/11/01 23:10:40	1.243
+++ parser3/src/classes/op.C	2016/11/10 22:52:49	1.245
@@ -18,7 +18,7 @@
 #include "pa_vclass.h"
 #include "pa_charset.h"
 
-volatile const char * IDENT_OP_C="$Id: op.C,v 1.243 2016/11/01 23:10:40 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.245 2016/11/10 22:52:49 moko Exp $";
 
 // defines
 
@@ -216,10 +216,11 @@ static void _process(Request& r, MethodP
 	// after restoring current-request-lang
 	// maybe-execute @main[]
 	if(main_method) {
-		VMethodFrame frame(*main_method, r.get_method_frame()->caller(), *target_self);
-		frame.empty_params();
-		r.call(frame);
-		r.write(frame.result());
+		METHOD_FRAME_ACTION(*main_method, r.get_method_frame()->caller(), *target_self, {
+			frame.empty_params();
+			r.call(frame);
+			r.write(frame.result());
+		});
 	}
 }
 	
@@ -451,7 +452,7 @@ static void _switch(Request& r, MethodPa
 	// because of stacked WWrapper used there as wcontext
 	r.process(cases_code);
 	if(Value* selected_code=data->found? data->found: data->_default)
-		r.write(r.process(*selected_code));
+		r.process_write(*selected_code);
 }
 
 static void _case(Request& r, MethodParams& params) {