Fixed bugs with evaluation