diff --git a/crates/fidc-core/src/platform_expr_strategy.rs b/crates/fidc-core/src/platform_expr_strategy.rs
index e69db7d..f3a9fbe 100644
--- a/crates/fidc-core/src/platform_expr_strategy.rs
+++ b/crates/fidc-core/src/platform_expr_strategy.rs
@@ -5912,12 +5912,10 @@ impl PlatformExprStrategy {
                 "open",
                 lookback,
             ),
-            "signal_close" => ctx.data.market_current_numeric_values(
-                day.date,
-                &self.config.signal_symbol,
-                "close",
-                lookback,
-            ),
+            "signal_close" => {
+                ctx.data
+                    .market_closes_up_to(day.date, &self.config.signal_symbol, lookback)
+            }
             "signal_volume" => ctx.data.market_current_numeric_values(
                 day.date,
                 &self.config.signal_symbol,