Evaluations Fix 2

Fixed a bug that was accidentally made in the last fix.
Merge remote-tracking branch 'origin/master' into cwDev