Fix optionset field bug