Fix resolve