Course functionality fix