Course entity fix