diff --git a/src/TColStd/TColStd_PackedMapOfInteger.cxx b/src/TColStd/TColStd_PackedMapOfInteger.cxx
index 7ac90c53b4..3903c1c3ab 100644
--- a/src/TColStd/TColStd_PackedMapOfInteger.cxx
+++ b/src/TColStd/TColStd_PackedMapOfInteger.cxx
@@ -23,8 +23,8 @@
 //function : TColStd_intMapNode_findNext
 //purpose  :
 //=======================================================================
-Standard_Integer TColStd_PackedMapOfInteger::TColStd_intMapNode_findNext (const Standard_Address theNode,
-                                                                          unsigned int&          theMask)
+Standard_Integer TColStd_PackedMapOfInteger::TColStd_intMapNode_findNext (const TColStd_intMapNode* theNode,
+                                                                          unsigned int& theMask)
 {
   const TColStd_intMapNode* aNode = reinterpret_cast<const TColStd_intMapNode*> (theNode);
   unsigned int val = aNode->Data() & theMask;
@@ -66,8 +66,8 @@ Standard_Integer TColStd_PackedMapOfInteger::TColStd_intMapNode_findNext (const
 //function : TColStd_intMapNode_findPrev
 //purpose  :
 //=======================================================================
-Standard_Integer TColStd_PackedMapOfInteger::TColStd_intMapNode_findPrev (const Standard_Address theNode,
-                                                                          unsigned int&          theMask)
+Standard_Integer TColStd_PackedMapOfInteger::TColStd_intMapNode_findPrev (const TColStd_intMapNode* theNode,
+                                                                          unsigned int& theMask)
 {
   const TColStd_intMapNode* aNode = reinterpret_cast<const TColStd_intMapNode*> (theNode);
   unsigned int val = aNode->Data() & theMask;
@@ -344,7 +344,7 @@ Standard_Integer TColStd_PackedMapOfInteger::GetMinimalMapped () const
   if (pFoundNode)
   {
     unsigned int aFullMask (0xffffffff);
-    aResult = TColStd_intMapNode_findNext ((const Standard_Address )pFoundNode, aFullMask);
+    aResult = TColStd_intMapNode_findNext (pFoundNode, aFullMask);
   }
   return aResult;
 }
@@ -378,7 +378,7 @@ Standard_Integer TColStd_PackedMapOfInteger::GetMaximalMapped () const
   if (pFoundNode)
   {
     unsigned int aFullMask (0xffffffff);
-    aResult = TColStd_intMapNode_findPrev ((const Standard_Address )pFoundNode, aFullMask);
+    aResult = TColStd_intMapNode_findPrev (pFoundNode, aFullMask);
   }
   return aResult;
 }
diff --git a/src/TColStd/TColStd_PackedMapOfInteger.hxx b/src/TColStd/TColStd_PackedMapOfInteger.hxx
index c8dd276544..50e9e659b2 100644
--- a/src/TColStd/TColStd_PackedMapOfInteger.hxx
+++ b/src/TColStd/TColStd_PackedMapOfInteger.hxx
@@ -447,12 +447,12 @@ private:
 
   //! Find the smallest non-zero bit under the given mask.
   //! Outputs the new mask that does not contain the detected bit.
-  Standard_EXPORT static Standard_Integer TColStd_intMapNode_findNext (const Standard_Address theNode,
+  Standard_EXPORT static Standard_Integer TColStd_intMapNode_findNext (const TColStd_intMapNode* theNode,
                                                                        unsigned int& theMask);
 
   //! Find the highest non-zero bit under the given mask.
   //! Outputs the new mask that does not contain the detected bit.
-  Standard_EXPORT static Standard_Integer TColStd_intMapNode_findPrev (const Standard_Address theNode,
+  Standard_EXPORT static Standard_Integer TColStd_intMapNode_findPrev (const TColStd_intMapNode* theNode,
                                                                        unsigned int& theMask);
 
   //! Compute the population (i.e., the number of non-zero bits) of the 32-bit word theData.