Simplify stash call logic
Fix Runner.Supervisor error for executed twice