Fix grade/_team