Fix remote resolver