Restore forceResolve to false