Class Fix / Enum Fix