Fixed: use given uri