Memory Class fix