diff --git a/base/internals/psi_graph_fnd_owner.F90 b/base/internals/psi_graph_fnd_owner.F90
index aa49871e..2ea02f75 100644
--- a/base/internals/psi_graph_fnd_owner.F90
+++ b/base/internals/psi_graph_fnd_owner.F90
@@ -306,6 +306,7 @@ contains
     ! Make sure we sweep through the entire vector immediately
     ! 
     if (ns == 0) ns = nv
+    ns = min(ns,size(tsmpl))
     ns_out = 0
 
     do while (ipntidx<= nv)