Finally fixed the bug with evaluations not belonging to the right submission