Pass this through
Fix issue with courseid not being recognised