Fix OptionSet Field bug