fix uri calls