Bug Fixed: Courses overriding each other