Fix resolve exception