Class fix