Fixes additional class calculation problems