diff --git a/src/Neuroglia.Serialization.YamlDotNet/Services/UriTypeSerializer.cs b/src/Neuroglia.Serialization.YamlDotNet/Services/UriTypeSerializer.cs
index 96007f61..e22b4bdd 100644
--- a/src/Neuroglia.Serialization.YamlDotNet/Services/UriTypeSerializer.cs
+++ b/src/Neuroglia.Serialization.YamlDotNet/Services/UriTypeSerializer.cs
@@ -39,7 +39,7 @@ public virtual object ReadYaml(IParser parser, Type type)
     public virtual void WriteYaml(IEmitter emitter, object? value, Type type)
     {
         if (value == null) return;
-        emitter.Emit(new Scalar(((Uri)value).ToString()));
+        emitter.Emit(new Scalar(((Uri)value).OriginalString));
     }
 
 }
\ No newline at end of file
diff --git a/src/Neuroglia.Serialization.YamlDotNet/Services/YamlSerializer.cs b/src/Neuroglia.Serialization.YamlDotNet/Services/YamlSerializer.cs
index 020bcffb..698f893b 100644
--- a/src/Neuroglia.Serialization.YamlDotNet/Services/YamlSerializer.cs
+++ b/src/Neuroglia.Serialization.YamlDotNet/Services/YamlSerializer.cs
@@ -59,10 +59,10 @@ public class YamlSerializer(YamlDotNet.Serialization.ISerializer serializer, IDe
         deserializer
             .IgnoreUnmatchedProperties()
             .WithNamingConvention(CamelCaseNamingConvention.Instance)
+            .WithNodeTypeResolver(new InferTypeResolver())
             .WithNodeDeserializer(
                 inner => new StringEnumDeserializer(inner),
                 syntax => syntax.InsteadOf<ScalarNodeDeserializer>())
-            .WithNodeTypeResolver(new InferTypeResolver())
             .WithNodeDeserializer(
                 inner => new JsonObjectDeserializer(inner),
                 syntax => syntax.InsteadOf<DictionaryNodeDeserializer>())