diff --git a/Directory.Build.props b/Directory.Build.props
index 8c3b316..c71829f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,32 +1,32 @@
 <Project>
-	<PropertyGroup>
-		<OutputType>Library</OutputType>
-		<Nullable>enable</Nullable>
-		<LangVersion>Latest</LangVersion>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+  <PropertyGroup>
+	<OutputType>Library</OutputType>
+	<Nullable>enable</Nullable>
+	<LangVersion>Latest</LangVersion>
+	<GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-		<Authors>ALTA Software llc.</Authors>
-		<Product>Domain Primitives</Product>
-		<Company>ALTA Software llc.</Company>
-		<Copyright>Copyright © 2024 ALTA Software llc.</Copyright>
-		<Version>2.0.0</Version>
-	</PropertyGroup>
+	<Authors>ALTA Software llc.</Authors>
+	<Product>Domain Primitives</Product>
+	<Company>ALTA Software llc.</Company>
+	<Copyright>Copyright © 2024 ALTA Software llc.</Copyright>
+	<Version>2.0.1</Version>
+  </PropertyGroup>
 
-	<PropertyGroup>
-		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<ProjectUrl>https://github.com/altasoft/DomainPrimitives</ProjectUrl>
-		<RepositoryUrl>https://github.com/altasoft/DomainPrimitives</RepositoryUrl>
-		<RepositoryType>git</RepositoryType>
-		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<PackageProjectUrl>https://github.com/altasoft/DomainPrimitives</PackageProjectUrl>
-		<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-		<EnableNETAnalyzers>True</EnableNETAnalyzers>
-		<PackageTags>ddd;domain;entity;dotnet-core;value-object;strongly-typed;</PackageTags>
-	</PropertyGroup>
+  <PropertyGroup>
+	<PackageReadmeFile>README.md</PackageReadmeFile>
+	<ProjectUrl>https://github.com/altasoft/DomainPrimitives</ProjectUrl>
+	<RepositoryUrl>https://github.com/altasoft/DomainPrimitives</RepositoryUrl>
+	<RepositoryType>git</RepositoryType>
+	<PackageLicenseExpression>MIT</PackageLicenseExpression>
+	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+	<PackageProjectUrl>https://github.com/altasoft/DomainPrimitives</PackageProjectUrl>
+	<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+	<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+	<EnableNETAnalyzers>True</EnableNETAnalyzers>
+	<PackageTags>ddd;domain;entity;dotnet-core;value-object;strongly-typed;</PackageTags>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<None Include="..\..\README.md" Pack="true" PackagePath="\" />
-	</ItemGroup>
+  <ItemGroup>
+	<None Include="..\..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
 </Project>
diff --git a/src/AltaSoft.DomainPrimitives.Generator/Helpers/MethodGeneratorHelper.cs b/src/AltaSoft.DomainPrimitives.Generator/Helpers/MethodGeneratorHelper.cs
index 93fcd73..f4e7ae6 100644
--- a/src/AltaSoft.DomainPrimitives.Generator/Helpers/MethodGeneratorHelper.cs
+++ b/src/AltaSoft.DomainPrimitives.Generator/Helpers/MethodGeneratorHelper.cs
@@ -701,11 +701,27 @@ public static void GenerateEquatableOperators(string className, string fieldName
 
         builder.AppendInheritDoc()
             .AppendLine("[MethodImpl(MethodImplOptions.AggressiveInlining)]")
-            .AppendLine($"public static bool operator ==({className} left, {className} right) => left.Equals(right);");
+            .Append($"public static bool operator ==({className}{nullable} left, {className}{nullable} right)");
+
+        if (isValueType)
+        {
+            builder.AppendLine(" => left.Equals(right);");
+        }
+        else
+        {
+            builder.NewLine();
+            builder.OpenBracket()
+                .AppendLine("if (ReferenceEquals(left, right))")
+                .AppendIndentation().AppendLine("return true;")
+                .AppendLine("if (left is null || right is null)")
+                .AppendIndentation().AppendLine("return false;")
+                .AppendLine("return left.Equals(right);")
+                .CloseBracket();
+        }
 
         builder.AppendInheritDoc()
-            .AppendLine("[MethodImpl(MethodImplOptions.AggressiveInlining)]")
-            .AppendLine($"public static bool operator !=({className} left, {className} right) => !(left == right);");
+                .AppendLine("[MethodImpl(MethodImplOptions.AggressiveInlining)]")
+                .AppendLine($"public static bool operator !=({className}{nullable} left, {className}{nullable} right) => !(left == right);");
     }
 
     /// <summary>