diff --git a/src/reader/reader.rs b/src/reader/reader.rs
index b6859a546..171123968 100644
--- a/src/reader/reader.rs
+++ b/src/reader/reader.rs
@@ -7302,10 +7302,10 @@ macro_rules! validate {
                 let mut cursor_pos = in_cursor_pos;
 
                 let result = completion_apply_to_command_line(
-                    &OperationContext::test_only_foreground(
+                    &OperationContext::foreground(
                         &parser,
-                        parser.vars(),
                         Box::new(no_cancel),
+                        crate::operation_context::EXPANSION_LIMIT_DEFAULT,
                     ),
                     completion,
                     $flags,