issue #8, fix the multiple grades problem