2 files changed, 10 insertions, 7 deletions

diff --git a/clap.zig b/clap.zig
index 798aebf..34b398b 100644
--- a/clap.zig
+++ b/clap.zig
@@ -277,8 +277,8 @@ pub fn Args(comptime Id: type, comptime params: []const Param(Id)) type {
             return a.clap.option(name);
         }
 
-        pub fn allOptions(a: @This(), comptime name: []const u8) [][]const u8 {
-            return a.clap.allOptions(name);
+        pub fn options(a: @This(), comptime name: []const u8) []const []const u8 {
+            return a.clap.options(name);
         }
 
         pub fn positionals(a: @This()) []const []const u8 {
diff --git a/clap/comptime.zig b/clap/comptime.zig
index edbaafb..99f0be6 100644
--- a/clap/comptime.zig
+++ b/clap/comptime.zig
@@ -39,7 +39,7 @@ pub fn ComptimeClap(comptime Id: type, comptime params: []const clap.Param(Id))
         allocator: *mem.Allocator,
 
         pub fn parse(allocator: *mem.Allocator, comptime ArgIter: type, iter: *ArgIter) !@This() {
-            var multis = [_]std.ArrayList([]const u8){undefined} ** single_options;
+            var multis = [_]std.ArrayList([]const u8){undefined} ** multi_options;
             for (multis) |*multi| {
                 multi.* = std.ArrayList([]const u8).init(allocator);
             }
@@ -64,13 +64,16 @@ pub fn ComptimeClap(comptime Id: type, comptime params: []const clap.Param(Id))
                     try pos.append(arg.value.?);
                 } else if (param.takes_value == .One) {
                     debug.assert(res.single_options.len != 0);
-                    res.single_options[param.id] = arg.value.?;
+                    if (res.single_options.len != 0)
+                        res.single_options[param.id] = arg.value.?;
                 } else if (param.takes_value == .Many) {
-                    debug.assert(res.multi_options.len != 0);
-                    try multis[param.id].append(arg.value.?);
+                    debug.assert(multis.len != 0);
+                    if (multis.len != 0)
+                        try multis[param.id].append(arg.value.?);
                 } else {
                     debug.assert(res.flags.len != 0);
-                    res.flags[param.id] = true;
+                    if (res.flags.len != 0)
+                        res.flags[param.id] = true;
                 }
             }