course structure hotfix

hotfix course structure fixes from #468 into master branch