Fix URI resolution