Fix resolve issue