Fix missed Uri -> Remapped