Fixed glitch with evaluation data