Bugfix in evaluation