Fixed bug for asessment logic