Another Class fix