Fix to OptionsRow