fix undef. add scope_return