Added Uri fix.