fixed the eval function huge issue