bug fixes Evaluate refactoring