diff --git a/src/mobility/position-allocator.cc b/src/mobility/position-allocator.cc
index 0bf06f863..31427117b 100644
--- a/src/mobility/position-allocator.cc
+++ b/src/mobility/position-allocator.cc
@@ -70,6 +70,10 @@ ListPositionAllocator::GetNext (void) const
 {
   Vector v = *m_current;
   m_current++;
+  if (m_current == m_positions.end()) 
+    {
+      m_current = m_positions.begin ();
+    }
   return v;
 }