Fix returning values "after" w/o using "before"