fixed bug with `return;`