Fix resolve / unresolve