diff --git a/src/h1/xsk/compiler.cpp b/src/h1/xsk/compiler.cpp
index 9ebe436b..72de998d 100644
--- a/src/h1/xsk/compiler.cpp
+++ b/src/h1/xsk/compiler.cpp
@@ -288,8 +288,6 @@ void compiler::emit_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_w
     emit_expr(ctx, stmt->obj);
     emit_opcode(ctx, opcode::OP_waittill);
 
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         create_variable(ctx, arg.as_name);
@@ -1760,14 +1758,10 @@ void compiler::process_expr(const gsc::context_ptr& ctx, const gsc::expr_ptr& ex
 
 void compiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_waittill_ptr& stmt)
 {
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         register_variable(ctx, arg.as_name->value);
     }
-
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
 }
 
 void compiler::process_stmt_if(const gsc::context_ptr& ctx, const gsc::stmt_if_ptr& stmt)
diff --git a/src/h2/xsk/compiler.cpp b/src/h2/xsk/compiler.cpp
index 8874be42..4c0b8dde 100644
--- a/src/h2/xsk/compiler.cpp
+++ b/src/h2/xsk/compiler.cpp
@@ -288,8 +288,6 @@ void compiler::emit_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_w
     emit_expr(ctx, stmt->obj);
     emit_opcode(ctx, opcode::OP_waittill);
 
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         create_variable(ctx, arg.as_name);
@@ -1760,14 +1758,10 @@ void compiler::process_expr(const gsc::context_ptr& ctx, const gsc::expr_ptr& ex
 
 void compiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_waittill_ptr& stmt)
 {
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         register_variable(ctx, arg.as_name->value);
     }
-
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
 }
 
 void compiler::process_stmt_if(const gsc::context_ptr& ctx, const gsc::stmt_if_ptr& stmt)
diff --git a/src/iw5/xsk/assembler.cpp b/src/iw5/xsk/assembler.cpp
index 518cb31f..a8ec44e7 100644
--- a/src/iw5/xsk/assembler.cpp
+++ b/src/iw5/xsk/assembler.cpp
@@ -261,7 +261,7 @@ void assembler::assemble_instruction(const gsc::instruction_ptr& inst)
         break;
     case opcode::OP_waittillmatch:
         script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
-        script_->write<std::uint16_t>(static_cast<std::uint16_t>(std::stoi(inst->data[0])));
+        script_->write<std::uint16_t>(0);
         break;
     case opcode::OP_CreateLocalVariable:
     case opcode::OP_RemoveLocalVariables:
diff --git a/src/iw5/xsk/compiler.cpp b/src/iw5/xsk/compiler.cpp
index 6771216a..2032d77b 100644
--- a/src/iw5/xsk/compiler.cpp
+++ b/src/iw5/xsk/compiler.cpp
@@ -287,8 +287,6 @@ void compiler::emit_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_w
     emit_expr(ctx, stmt->obj);
     emit_opcode(ctx, opcode::OP_waittill);
 
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         create_variable(ctx, arg.as_name);
@@ -1754,14 +1752,10 @@ void compiler::process_expr(const gsc::context_ptr& ctx, const gsc::expr_ptr& ex
 
 void compiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_waittill_ptr& stmt)
 {
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         register_variable(ctx, arg.as_name->value);
     }
-
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
 }
 
 void compiler::process_stmt_if(const gsc::context_ptr& ctx, const gsc::stmt_if_ptr& stmt)
diff --git a/src/iw6/xsk/compiler.cpp b/src/iw6/xsk/compiler.cpp
index 7a130ba6..73d38f3e 100644
--- a/src/iw6/xsk/compiler.cpp
+++ b/src/iw6/xsk/compiler.cpp
@@ -287,8 +287,6 @@ void compiler::emit_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_w
     emit_expr(ctx, stmt->obj);
     emit_opcode(ctx, opcode::OP_waittill);
 
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         create_variable(ctx, arg.as_name);
@@ -1754,14 +1752,10 @@ void compiler::process_expr(const gsc::context_ptr& ctx, const gsc::expr_ptr& ex
 
 void compiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_waittill_ptr& stmt)
 {
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         register_variable(ctx, arg.as_name->value);
     }
-
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
 }
 
 void compiler::process_stmt_if(const gsc::context_ptr& ctx, const gsc::stmt_if_ptr& stmt)
diff --git a/src/iw7/xsk/compiler.cpp b/src/iw7/xsk/compiler.cpp
index 869b0505..6d0d70dd 100644
--- a/src/iw7/xsk/compiler.cpp
+++ b/src/iw7/xsk/compiler.cpp
@@ -287,8 +287,6 @@ void compiler::emit_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_w
     emit_expr(ctx, stmt->obj);
     emit_opcode(ctx, opcode::OP_waittill);
 
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         create_variable(ctx, arg.as_name);
@@ -1754,14 +1752,10 @@ void compiler::process_expr(const gsc::context_ptr& ctx, const gsc::expr_ptr& ex
 
 void compiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_waittill_ptr& stmt)
 {
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         register_variable(ctx, arg.as_name->value);
     }
-
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
 }
 
 void compiler::process_stmt_if(const gsc::context_ptr& ctx, const gsc::stmt_if_ptr& stmt)
diff --git a/src/s1/xsk/compiler.cpp b/src/s1/xsk/compiler.cpp
index 962e2208..3650fffd 100644
--- a/src/s1/xsk/compiler.cpp
+++ b/src/s1/xsk/compiler.cpp
@@ -288,8 +288,6 @@ void compiler::emit_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_w
     emit_expr(ctx, stmt->obj);
     emit_opcode(ctx, opcode::OP_waittill);
 
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         create_variable(ctx, arg.as_name);
@@ -1760,14 +1758,10 @@ void compiler::process_expr(const gsc::context_ptr& ctx, const gsc::expr_ptr& ex
 
 void compiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_waittill_ptr& stmt)
 {
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         register_variable(ctx, arg.as_name->value);
     }
-
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
 }
 
 void compiler::process_stmt_if(const gsc::context_ptr& ctx, const gsc::stmt_if_ptr& stmt)
diff --git a/src/s2/xsk/compiler.cpp b/src/s2/xsk/compiler.cpp
index 836463a3..7e495531 100644
--- a/src/s2/xsk/compiler.cpp
+++ b/src/s2/xsk/compiler.cpp
@@ -288,8 +288,6 @@ void compiler::emit_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_w
     emit_expr(ctx, stmt->obj);
     emit_opcode(ctx, opcode::OP_waittill);
 
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         create_variable(ctx, arg.as_name);
@@ -1760,14 +1758,10 @@ void compiler::process_expr(const gsc::context_ptr& ctx, const gsc::expr_ptr& ex
 
 void compiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::stmt_waittill_ptr& stmt)
 {
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
-
     for(const auto& arg : stmt->args->list)
     {
         register_variable(ctx, arg.as_name->value);
     }
-
-    std::reverse(stmt->args->list.begin(), stmt->args->list.end());
 }
 
 void compiler::process_stmt_if(const gsc::context_ptr& ctx, const gsc::stmt_if_ptr& stmt)