In Class fix