fix xml-wrapper using option class