diff --git a/Trajectories/trajectories.py b/Trajectories/trajectories.py
index f66f16966ec4a4430b28308b006e39a2e87e7f0f..2ae477f6e40cfe012b47ca34cb4dd17490cd7ae3 100755
--- a/Trajectories/trajectories.py
+++ b/Trajectories/trajectories.py
@@ -76,6 +76,7 @@ traj_vert_ind = []
 # of vertex indices.
 
 in_deg_prop = g.degree_property_map("in")
+out_deg_prop = g.degree_property_map("out")
 
 # Loop to define traj_prop:
 for n in topology.topological_sort(g):
@@ -89,11 +90,11 @@ for n in topology.topological_sort(g):
         pred = g.get_in_neighbors(n)
 
         if in_deg_prop[pred[0]] == 1 == in_deg_prop[pred[1]] \
-           and np.all(g.get_out_degrees(pred) == 1):
+           == out_deg_prop[pred[0]] == out_deg_prop[pred[1]]:
             n1 = g.get_in_neighbors(pred[0])[0]
             n2 = g.get_in_neighbors(pred[1])[0]
 
-            if n1 == n2 and g.vertex(n1).out_degree() == 2:
+            if n1 == n2 and out_deg_prop[n1] == 2:
                 # We have a splitting event at n1 immediately followed
                 # by a merging at n. Check the time interval between
                 # splitting and merging. The date of merging is the