Fix resolve error