diff --git a/natvis/entt/entity.natvis b/natvis/entt/entity.natvis
index 8d9fef735..dc1fd1e0c 100644
--- a/natvis/entt/entity.natvis
+++ b/natvis/entt/entity.natvis
@@ -30,8 +30,8 @@
 			<Parameter Name="page" Type="traits_type::entity_type"/>
 			<Parameter Name="offset" Type="traits_type::entity_type"/>
 		</Intrinsic>
-		<Intrinsic Name="is_valid_entity" Expression="!traits_type::version_mask || (*((traits_type::entity_type *)&amp;packed[pos]) &lt; (traits_type::version_mask &lt;&lt; traits_type::length))">
-			<Parameter Name="pos" Type="traits_type::entity_type"/>
+		<Intrinsic Name="is_valid_entity" Expression="!traits_type::version_mask || (*((traits_type::entity_type *)&amp;entity) &lt; (traits_type::version_mask &lt;&lt; traits_type::length))">
+			<Parameter Name="entity" Type="traits_type::value_type"/>
 		</Intrinsic>
 		<DisplayString>{{ size={ packed.size() }, type={ info->alias,na } }}</DisplayString>
 		<Expand>
@@ -65,7 +65,7 @@
 						<Variable Name="pos" InitialValue="0"/>
 						<Loop>
 							<Break Condition="pos == packed.size()"/>
-							<If Condition="is_valid_entity(pos)">
+							<If Condition="is_valid_entity(packed[pos])">
 								<Item Name="[{ pos }]">packed[pos]</Item>
 							</If>
 							<Exec>++pos</Exec>
@@ -76,8 +76,8 @@
 		</Expand>
 	</Type>
 	<Type Name="entt::basic_storage&lt;*&gt;">
-		<Intrinsic Name="is_valid_entity" Expression="!base_type::traits_type::version_mask || (*((base_type::traits_type::entity_type *)&amp;base_type::packed[pos]) &lt; (base_type::traits_type::version_mask &lt;&lt; base_type::traits_type::length))">
-			<Parameter Name="pos" Type="base_type::traits_type::entity_type"/>
+		<Intrinsic Name="is_valid_entity" Expression="!base_type::traits_type::version_mask || (*((base_type::traits_type::entity_type *)&amp;entity) &lt; (base_type::traits_type::version_mask &lt;&lt; base_type::traits_type::length))">
+			<Parameter Name="entity" Type="base_type::traits_type::value_type"/>
 		</Intrinsic>
 		<DisplayString>{{ size={ base_type::packed.size() }, type={ base_type::info->alias,na } }}</DisplayString>
 		<Expand>
@@ -90,7 +90,7 @@
 				<Variable Name="pos" InitialValue="0" />
 				<Loop>
 					<Break Condition="pos == base_type::packed.size()"/>
-					<If Condition="is_valid_entity(pos)">
+					<If Condition="is_valid_entity(base_type::packed[pos])">
 						<Item Name="[{ pos }:{ base_type::packed[pos] }]">payload[pos / traits_type::page_size][pos &amp; (traits_type::page_size - 1)]</Item>
 					</If>
 					<Exec>++pos</Exec>