fix evaluationg
Merge branch 'hotfix/fix_evaluations'

* hotfix/fix_evaluations:
  fix evaluationg