diff --git a/chain/stmgr/searchwait.go b/chain/stmgr/searchwait.go
index 754f0e7a4..e9feeec12 100644
--- a/chain/stmgr/searchwait.go
+++ b/chain/stmgr/searchwait.go
@@ -187,6 +187,7 @@ func (sm *StateManager) searchForIndexedMsg(ctx context.Context, mcid cid.Cid, m
 	}
 
 	// now get the execution tipset
+	// TODO optimization: the index should have it implicitly so we can return it in the msginfo.
 	xts, err := sm.cs.GetTipsetByHeight(ctx, minfo.Epoch+1, curTs, false)
 	if err != nil {
 		return nil, nil, cid.Undef, err