resolver fix