Possibly fixed evaluate bug