base resolver fix