Fix bug on non-course tasks