Fixing enumeration errors.