Added check if attributes present, to prevent false positive for evaluations