Eval loop fix