diff --git a/strudel.mjs b/strudel.mjs
index 2dee5e04..044b7123 100644
--- a/strudel.mjs
+++ b/strudel.mjs
@@ -726,7 +726,7 @@ function steady(value) {
 }
 
 export const signal = func => {
-    const query = span => [new Hap(undefined, span, func(span.midpoint()))]
+    const query = state => [new Hap(undefined, state.span, func(state.span.midpoint()))]
     return new Pattern(query)
 }
 
diff --git a/test/pattern.test.mjs b/test/pattern.test.mjs
index 8c8b546e..ae950321 100644
--- a/test/pattern.test.mjs
+++ b/test/pattern.test.mjs
@@ -382,13 +382,13 @@ describe('Pattern', function() {
   describe("early", () => {
     it("Can shift an event earlier", () => {
       assert.deepStrictEqual(
-        pure(30)._late(0.25).query(ts(1,2)),
+        pure(30)._late(0.25).query(st(1,2)),
         [hap(ts(1/4,5/4), ts(1,5/4), 30), hap(ts(5/4,9/4), ts(5/4,2), 30)]
       )
     })
     it("Can shift an event earlier, into negative time", () => {
       assert.deepStrictEqual(
-        pure(30)._late(0.25).query(ts(0,1)),
+        pure(30)._late(0.25).query(st(0,1)),
         [hap(ts(-3/4,1/4), ts(0,1/4), 30), hap(ts(1/4,5/4), ts(1/4,1), 30)]
       )
     })