fixed evaluate