diff --git a/libgrive/src/base/State.cc b/libgrive/src/base/State.cc
index 20b13ef..8323216 100644
--- a/libgrive/src/base/State.cc
+++ b/libgrive/src/base/State.cc
@@ -164,9 +164,9 @@ std::size_t State::TryResolveEntry()
 	assert( !m_unresolved.empty() ) ;
 
 	std::size_t count = 0 ;
-	std::vector<Entry>& en = m_unresolved ;
-	
-	for ( std::vector<Entry>::iterator i = en.begin() ; i != en.end() ; )
+	std::list<Entry>& en = m_unresolved ;
+
+	for ( std::list<Entry>::iterator i = en.begin() ; i != en.end() ; )
 	{
 		if ( Update( *i ) )
 		{
diff --git a/libgrive/src/base/State.hh b/libgrive/src/base/State.hh
index 1d5dcc1..088be38 100644
--- a/libgrive/src/base/State.hh
+++ b/libgrive/src/base/State.hh
@@ -79,7 +79,7 @@ private :
 	Val					m_st ;
 	bool				m_force ;
 	
-	std::vector<Entry>	m_unresolved ;
+	std::list<Entry>	m_unresolved ;
 } ;
 
 } // end of namespace gr