Database resolver fix