some fixing in eval