Fixed a bug when semester=None