Fix the issue of duplication due assessments