diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 598ad4127..15e00871b 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1666,7 +1666,8 @@ void cEntity::SetSwimState(cChunk & a_Chunk)
 	m_IsSwimming = IsBlockWater(BlockIn);
 
 	// Check if the player is submerged:
-	VERIFY(a_Chunk.UnboundedRelGetBlockType(RelX, RelY + 1, RelZ, BlockIn));
+	int HeadHeight = CeilC(GetPosY() + GetHeight()) - 1;
+	VERIFY(a_Chunk.UnboundedRelGetBlockType(RelX, HeadHeight, RelZ, BlockIn));
 	m_IsSubmerged = IsBlockWater(BlockIn);
 }
 
@@ -1698,7 +1699,7 @@ void cEntity::DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ)
 void cEntity::HandleAir(void)
 {
 	// Ref.: https://minecraft.gamepedia.com/Chunk_format
-	// See if the entity is /submerged/ water (block above is water)
+	// See if the entity is /submerged/ water (head is in water)
 	// Get the type of block the entity is standing in:
 
 	int RespirationLevel = static_cast<int>(GetEquippedHelmet().m_Enchantments.GetLevel(cEnchantments::enchRespiration));
diff --git a/src/Mobs/Squid.h b/src/Mobs/Squid.h
index 590c50495..aeeec77df 100644
--- a/src/Mobs/Squid.h
+++ b/src/Mobs/Squid.h
@@ -23,7 +23,6 @@ public:
 
 	// Squids do not drown (or float)
 	virtual void HandleAir(void) override {}
-	virtual void SetSwimState(cChunk & a_Chunk) override {}
 } ;