bugfix in evaluation engine