fixes in eval