Corrected the decoding of the enumeration fields