Fixing bug: we can't "return" from the generated code

Fixing bug: we can't "return" from the generated code #280