diff --git a/lightningd/pay.c b/lightningd/pay.c
index a574a1729..d06f2224d 100644
--- a/lightningd/pay.c
+++ b/lightningd/pay.c
@@ -328,6 +328,7 @@ remote_routing_failure(const tal_t *ctx,
 		if (failcode & PERM)
 			*pay_errcode = PAY_DESTINATION_PERM_FAIL;
 		else
+			/* FIXME: not right for WIRE_FINAL_EXPIRY_TOO_SOON */
 			*pay_errcode = PAY_TRY_OTHER_ROUTE;
 		erring_node = &route_nodes[origin_index];
 	} else {
diff --git a/tests/test_pay.py b/tests/test_pay.py
index caba5cce2..cfbf71398 100644
--- a/tests/test_pay.py
+++ b/tests/test_pay.py
@@ -1374,6 +1374,9 @@ def test_pay_direct(node_factory, bitcoind):
     # Let channels lock in.
     bitcoind.generate_block(5)
 
+    # Make l1 sees it, so it doesn't produce bad CLTVs.
+    sync_blockheight(bitcoind, [l1])
+
     # Make sure l0 knows the l2->l3 channel.
     # Without DEVELOPER, channel lockin can take 30 seconds to detect,
     # and gossip 2 minutes to propagate