Fix to work with assessments correctly