PIM-3264: fix option resolver