Bugs in evaluation model removed