Fix optionResolver