Fixed some issues caused by single evaluation work
4 files changed