fix some evaluation bugs