fixed lookup by uid