Fixed problems different courses