Fixed possible issues with course selection