diff --git a/src/SuperBlazorComponents/Components/SuperDataGrid/SuperDataGrid.razor b/src/SuperBlazorComponents/Components/SuperDataGrid/SuperDataGrid.razor
index 0777e77..99f2f4b 100644
--- a/src/SuperBlazorComponents/Components/SuperDataGrid/SuperDataGrid.razor
+++ b/src/SuperBlazorComponents/Components/SuperDataGrid/SuperDataGrid.razor
@@ -102,7 +102,7 @@
                                 {
                                     var column = verticalVisibleCols[colIdx];
                                     var isLastRow = colIdx == verticalVisibleCols.Count - 1;
-                                    <tr @key="(TryGetItemKey(item), column.Property)"
+                                    <tr @key="(TryGetItemKey(item), column)"
                                         class="sdg-vertical-row sdg-vertical-item @(isLastRow ? "sdg-vertical-item-last" : "") @verticalRowClass"
                                         @onclick="@(() => OnRowClick(item))"
                                         @ondblclick="@(() => OnRowDoubleClick(item))">
@@ -323,7 +323,7 @@
                                     @foreach (var column in visibleColumns)
                                     {
                                         var cellTitle = GetCellTitle(column, rowItem);
-                                        <td @key="(TryGetItemKey(rowItem), column.Property)"
+                                        <td @key="(TryGetItemKey(rowItem), column)"
                                             class="@GetCellClass(column, rowItem, cellTitle)"
                                             style="@GetCombinedCellStyle(column)"
                                             title="@cellTitle"
@@ -427,7 +427,7 @@
                                                     @foreach (var column in visibleColumns)
                                                     {
                                                         var cellTitle = GetCellTitle(column, rowItem);
-                                                        <td @key="(TryGetItemKey(rowItem), column.Property)"
+                                                        <td @key="(TryGetItemKey(rowItem), column)"
                                                             class="@GetCellClass(column, rowItem, cellTitle)"
                                                             style="@GetCombinedCellStyle(column)"
                                                             title="@cellTitle"
diff --git a/src/SuperBlazorComponents/SuperBlazorComponents.csproj b/src/SuperBlazorComponents/SuperBlazorComponents.csproj
index 695fb34..4608746 100644
--- a/src/SuperBlazorComponents/SuperBlazorComponents.csproj
+++ b/src/SuperBlazorComponents/SuperBlazorComponents.csproj
@@ -4,7 +4,7 @@
 		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<VersionPrefix>2.0.4</VersionPrefix>
+		<VersionPrefix>2.0.5</VersionPrefix>
 		<GenerateDocumentationFile>false</GenerateDocumentationFile>
 		<RootNamespace>SuperBlazorComponents</RootNamespace>
 		<AssemblyName>SuperBlazorComponents</AssemblyName>