diff --git a/src/Stmt.cc b/src/Stmt.cc
index 6b3dd99542..9dfd7ea1f4 100644
--- a/src/Stmt.cc
+++ b/src/Stmt.cc
@@ -2185,6 +2185,12 @@ TraversalCode WhenStmt::Traverse(TraversalCallback* cb) const
 			}
 		}
 
+	if ( wi->TimeoutExpr() )
+		{
+		tc = wi->TimeoutExpr()->Traverse(cb);
+		HANDLE_TC_STMT_PRE(tc);
+		}
+
 	tc = cb->PostStmt(this);
 	HANDLE_TC_STMT_POST(tc);
 	}