Change course.id to course.course_id for consistency