4 files changed, 5 insertions, 7 deletions

diff --git a/src/install.zig b/src/install.zig
index de6d8f0..8a16e49 100644
--- a/src/install.zig
+++ b/src/install.zig
@@ -25,7 +25,7 @@ pub fn main(comptime Result: type, config: Config, res: Result) !void {
     var available = try Installation.getAvailableList(config);
     defer Installation.deinitMap(allocator, &available);
 
-    return perform(allocator, res.positionals[0], res.args.force != 0, available);
+    return perform(allocator, res.positionals[0].?, res.args.force != 0, available);
 }
 
 pub fn perform(allocator: Allocator, name: []const u8, force: bool, available: Installations) !void {
diff --git a/src/main.zig b/src/main.zig
index 0fe6f16..c7e3844 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -99,11 +99,9 @@ const Help = struct {
     pub const max_args = 1;
 
     pub fn main(comptime Result: type, _: Config, res: Result) !void {
-        if (res.positionals.len == 0) {
+        const cmd = res.positionals[0] orelse {
             return mainHelp();
-        }
-
-        const cmd = res.positionals[0];
+        };
         return dispatch(cmd, "help", unknownHelp, .{cmd});
     }
 
diff --git a/src/remove.zig b/src/remove.zig
index bc5b06a..fb53d06 100644
--- a/src/remove.zig
+++ b/src/remove.zig
@@ -16,7 +16,7 @@ pub const max_args = 1;
 pub fn main(comptime Result: type, config: Config, res: Result) !void {
     const allocator = config.allocator;
 
-    const name = res.positionals[0];
+    const name = res.positionals[0].?;
 
     if (!try Installation.isInstalled(allocator, name)) {
         std.log.err("{s} is not installed!", .{name});
diff --git a/src/switch.zig b/src/switch.zig
index 3323332..891c4e0 100644
--- a/src/switch.zig
+++ b/src/switch.zig
@@ -13,7 +13,7 @@ pub const max_args = 1;
 pub fn main(comptime Result: type, config: Config, res: Result) !void {
     const allocator = config.allocator;
 
-    const name = res.positionals[0];
+    const name = res.positionals[0].?;
     if (!try Installation.isInstalled(allocator, name)) {
         std.log.err(
             "No installation by name {s} found, run `zup install {s}`",