fix merge issue that completely broke optionsets