Evaluations Fix 3

Just another bug fix.
Merge remote-tracking branch 'origin/master' into cwDev