Fixed support for different gradesystems