Fix option set field bug