Fixed empty course id bug
Merge branch 'dev'