diff --git a/include/sta/Search.hh b/include/sta/Search.hh
index 18efcf20..f1d8ca7e 100644
--- a/include/sta/Search.hh
+++ b/include/sta/Search.hh
@@ -521,9 +521,7 @@ protected:
 			     bool clk_gating_hold);
   bool matchesFilterTo(Path *path,
 		       const ClockEdge *to_clk_edge) const;
-  void pathClkPathArrival1(const Path *path,
-			   // Return value.
-			   PathRef &clk_path) const;
+  PathRef pathClkPathArrival1(const Path *path) const;
 
   ////////////////////////////////////////////////////////////////
 
diff --git a/search/Search.cc b/search/Search.cc
index 949d542a..5b596bcb 100644
--- a/search/Search.cc
+++ b/search/Search.cc
@@ -2258,24 +2258,22 @@ Search::clkPathArrival(const Path *clk_path,
 Arrival
 Search::pathClkPathArrival(const Path *path) const
 {
-  PathRef src_clk_path;
-  pathClkPathArrival1(path, src_clk_path);
-  if (!src_clk_path.isNull())
-    return clkPathArrival(&src_clk_path);
-  else {
-    // Check for input arrival clock.
-    ClockEdge *clk_edge = path->clkEdge(this);
-    if (clk_edge)
-      return clk_edge->time();
+  ClkInfo *clk_info = path->clkInfo(this);
+  if (clk_info->isPropagated()) {
+    PathRef src_clk_path =  pathClkPathArrival1(path);
+    if (!src_clk_path.isNull())
+      return clkPathArrival(&src_clk_path);
   }
+  // Check for input arrival clock.
+  ClockEdge *clk_edge = path->clkEdge(this);
+  if (clk_edge)
+    return clk_edge->time();
   return 0.0;
 }
 
 // PathExpanded::expand() and PathExpanded::clkPath().
-void
-Search::pathClkPathArrival1(const Path *path,
-			    // Return value.
-			    PathRef &clk_path) const
+PathRef
+Search::pathClkPathArrival1(const Path *path) const
 {
   PathRef p(path);
   while (!p.isNull()) {
@@ -2283,28 +2281,25 @@ Search::pathClkPathArrival1(const Path *path,
     TimingArc *prev_arc;
     p.prevPath(this, prev_path, prev_arc);
 
-    if (p.isClock(this)) {
-      clk_path.init(p);
-      return;
-    }
+    if (p.isClock(this))
+      return p;
     if (prev_arc) {
       TimingRole *prev_role = prev_arc->role();
       if (prev_role == TimingRole::regClkToQ()
 	  || prev_role == TimingRole::latchEnToQ()) {
 	p.prevPath(this, prev_path, prev_arc);
-	clk_path.init(prev_path);
-	return;
+	return prev_path;
       }
       else if (prev_role == TimingRole::latchDtoQ()) {
 	Edge *prev_edge = p.prevEdge(prev_arc, this);
 	PathVertex enable_path;
 	latches_->latchEnablePath(&p, prev_edge, enable_path);
-	clk_path.init(enable_path);
-	return;
+	return enable_path;
       }
     }
     p.init(prev_path);
   }
+  return PathRef();
 }
 
 ////////////////////////////////////////////////////////////////