fixes to option change