diff --git a/src/base/base_command_line.c b/src/base/base_command_line.c
index 1bf3312d..2c761583 100644
--- a/src/base/base_command_line.c
+++ b/src/base/base_command_line.c
@@ -92,6 +92,7 @@ cmd_line_from_string_list(Arena *arena, String8List command_line)
   
   // NOTE(rjf): Parse command line.
   B32 after_passthrough_option = 0;
+  B32 first_passthrough = 1;
   for(String8Node *node = command_line.first->next, *next = 0; node != 0; node = next)
   {
     next = node->next;
@@ -175,10 +176,11 @@ cmd_line_from_string_list(Arena *arena, String8List command_line)
     
     // NOTE(rjf): Default path, treat as a passthrough config option to be
     // handled by tool-specific code.
-    else if(!str8_match(node->string, str8_lit("--"), 0))
+    else if(!str8_match(node->string, str8_lit("--"), 0) || !first_passthrough)
     {
       str8_list_push(arena, &parsed.inputs, node->string);
       after_passthrough_option = 1;
+      first_passthrough = 0;
     }
   }
   
diff --git a/src/raddbg/raddbg.h b/src/raddbg/raddbg.h
index 92dfcd92..927e2393 100644
--- a/src/raddbg/raddbg.h
+++ b/src/raddbg/raddbg.h
@@ -37,7 +37,6 @@
 ////////////////////////////////
 //~ rjf: Hot, High Priority Tasks (Complete Unusability, Crashes, Fire-Worthy)
 //
-// [ ] raddbg jai.exe my_file.jai -- foobar -> raddbg consumes `--` incorrectly
 // [ ] PDB files distributed with the build are not found by DbgHelp!!!
 // [ ] Jai compiler debugging crash
 //
@@ -376,6 +375,7 @@
 // [x] robustify dbgi layer to renames (cache should not be based only on
 //     path - must invalidate naturally when new filetime occurs)
 // [x] rdi file regeneration too strict
+// [x] raddbg jai.exe my_file.jai -- foobar -> raddbg consumes `--` incorrectly
 
 #ifndef RADDBG_H
 #define RADDBG_H