[3.0] Fix eval return; set dir consistently throughnout

[3.0] Fix eval return; set dir consistently throughnout #489