diff --git a/src/TestTopOpeTools/TestTopOpeTools_Trace.cxx b/src/TestTopOpeTools/TestTopOpeTools_Trace.cxx
index c182f25302..9e25d14b35 100644
--- a/src/TestTopOpeTools/TestTopOpeTools_Trace.cxx
+++ b/src/TestTopOpeTools/TestTopOpeTools_Trace.cxx
@@ -22,7 +22,6 @@ TestTopOpeTools_Trace::TestTopOpeTools_Trace
  mygenre(genre),
  myfirstentry(1),mynbmaxentry(nbmaxentry),mynbentries(0),
  myflag(myfirstentry,mynbmaxentry), 
- myfunc(myfirstentry,mynbmaxentry), 
  myftyp(myfirstentry,mynbmaxentry),
  myverbose(Standard_False),
  myfverbose(myfirstentry,mynbmaxentry)
@@ -33,7 +32,6 @@ TestTopOpeTools_Trace::TestTopOpeTools_Trace
 mygenre("flag"),
 myfirstentry(1),mynbmaxentry(nbmaxentry),mynbentries(0),
 myflag(myfirstentry,mynbmaxentry), 
-myfunc(myfirstentry,mynbmaxentry), 
 myftyp(myfirstentry,mynbmaxentry),
 myverbose(Standard_False),
 myfverbose(myfirstentry,mynbmaxentry)
@@ -153,7 +151,7 @@ Standard_Boolean TestTopOpeTools_Trace::Exist
 (const tf_value func, Standard_Integer& index)
 { 
   for (Standard_Integer i=myfirstentry; i<=mynbentries; i++)
-    if (myfunc.Value(i) == ((long)func)) { index = i; return Standard_True; }
+    if (myfunc.Value(i) == func) { index = i; return Standard_True; }
   return Standard_False;
 }
 
@@ -161,7 +159,7 @@ const t_flag TestTopOpeTools_Trace::Getflag(const Standard_Integer index)
 { return (t_flag)myflag.Value(index); }
 
 const tf_value TestTopOpeTools_Trace::Getfunc(const Standard_Integer index)
-{ return (tf_value)myfunc.Value(index); }
+{ return myfunc.Value(index); }
 
 const te_ftyp TestTopOpeTools_Trace::Getftyp(const Standard_Integer index)
 {
@@ -178,7 +176,7 @@ Standard_Integer TestTopOpeTools_Trace::Add
   if ( Exist(flag,index) || ( mynbentries >= mynbmaxentry) ) return 1;
   mynbentries++;
   myflag.SetValue(mynbentries,flag);
-  myfunc.SetValue(mynbentries,(long)func);
+  myfunc.SetValue(mynbentries,func);
   myftyp.SetValue(mynbentries,(Standard_Integer)ftyp);
   myfverbose.SetValue(mynbentries,Standard_False);
   return 0;
diff --git a/src/TestTopOpeTools/TestTopOpeTools_Trace.hxx b/src/TestTopOpeTools/TestTopOpeTools_Trace.hxx
index ecf1c6a0cd..5ff67f7493 100644
--- a/src/TestTopOpeTools/TestTopOpeTools_Trace.hxx
+++ b/src/TestTopOpeTools/TestTopOpeTools_Trace.hxx
@@ -17,6 +17,7 @@
 #ifndef _TestTopOpeTools_Trace_HeaderFile
 #define _TestTopOpeTools_Trace_HeaderFile
 
+#include <NCollection_Vector.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_Array1OfAsciiString.hxx>
 #include <TColStd_Array1OfInteger.hxx>
@@ -121,13 +122,14 @@ private:
   
   // ==== Fields
   
-  TCollection_AsciiString     mygenre;
-  Standard_Integer            myfirstentry,mynbmaxentry,mynbentries;
-  TColStd_Array1OfAsciiString myflag;
-  TColStd_Array1OfInteger     myfunc;
-  TColStd_Array1OfInteger     myftyp;
-  Standard_Boolean            myverbose;
-  TColStd_Array1OfBoolean     myfverbose;
+  TCollection_AsciiString           mygenre;
+  Standard_Integer                  myfirstentry,mynbmaxentry,mynbentries;
+  TColStd_Array1OfAsciiString       myflag;
+  NCollection_Vector<tf_value>      myfunc;
+  TColStd_Array1OfInteger           myftyp;
+  Standard_Boolean                  myverbose;
+  TColStd_Array1OfBoolean           myfverbose;
+
 };
 
 #endif