Fix when courses starts at 18