Fix for non-threaded resolver.