Fixed optionSet-loading problem