fix bugs
Merge branch 'add-feature-on-eval-hotfix'