diff --git a/src/Stmt.cc b/src/Stmt.cc
index 0edca90435..fb9005c148 100644
--- a/src/Stmt.cc
+++ b/src/Stmt.cc
@@ -2105,6 +2105,12 @@ TraversalCode WhenStmt::Traverse(TraversalCallback* cb) const
 	tc = wi->WhenBody()->Traverse(cb);
 	HANDLE_TC_STMT_PRE(tc);
 
+	if ( wi->TimeoutExpr() )
+		{
+		tc = wi->TimeoutExpr()->Traverse(cb);
+		HANDLE_TC_STMT_PRE(tc);
+		}
+
 	if ( wi->TimeoutStmt() )
 		{
 		tc = wi->TimeoutStmt()->Traverse(cb);