diff --git a/src/ImageConverter/ImageConverterArgs.cpp b/src/ImageConverter/ImageConverterArgs.cpp
index 69a3a1ae..375da2fd 100644
--- a/src/ImageConverter/ImageConverterArgs.cpp
+++ b/src/ImageConverter/ImageConverterArgs.cpp
@@ -73,7 +73,7 @@ void ImageConverterArgs::SetVerbose(const bool isVerbose)
 bool ImageConverterArgs::ParseArgs(const int argc, const char** argv, bool& shouldContinue)
 {
     shouldContinue = true;
-    if (!m_argument_parser.ParseArguments(argc - 1, &argv[1]))
+    if (!m_argument_parser.ParseArguments(argc, argv))
     {
         PrintUsage();
         return false;
diff --git a/src/Linker/LinkerArgs.cpp b/src/Linker/LinkerArgs.cpp
index d8addde4..32d4c186 100644
--- a/src/Linker/LinkerArgs.cpp
+++ b/src/Linker/LinkerArgs.cpp
@@ -245,7 +245,7 @@ std::set<std::string> LinkerArgs::GetSearchPathsForProject(const std::set<std::s
 bool LinkerArgs::ParseArgs(const int argc, const char** argv, bool& shouldContinue)
 {
     shouldContinue = true;
-    if (!m_argument_parser.ParseArguments(argc - 1, &argv[1]))
+    if (!m_argument_parser.ParseArguments(argc, argv))
     {
         PrintUsage();
         return false;
diff --git a/src/RawTemplater/RawTemplaterArguments.cpp b/src/RawTemplater/RawTemplaterArguments.cpp
index 8f297346..a5ce4cca 100644
--- a/src/RawTemplater/RawTemplaterArguments.cpp
+++ b/src/RawTemplater/RawTemplaterArguments.cpp
@@ -89,7 +89,7 @@ void RawTemplaterArguments::PrintVersion()
 bool RawTemplaterArguments::ParseArgs(const int argc, const char** argv, bool& shouldContinue)
 {
     shouldContinue = true;
-    if (!m_argument_parser.ParseArguments(argc - 1, &argv[1]))
+    if (!m_argument_parser.ParseArguments(argc, argv))
     {
         PrintUsage();
         return false;
diff --git a/src/Unlinker/UnlinkerArgs.cpp b/src/Unlinker/UnlinkerArgs.cpp
index 9f114da2..4b74c27e 100644
--- a/src/Unlinker/UnlinkerArgs.cpp
+++ b/src/Unlinker/UnlinkerArgs.cpp
@@ -265,7 +265,7 @@ void UnlinkerArgs::ParseCommaSeparatedAssetTypeString(const std::string& input)
 bool UnlinkerArgs::ParseArgs(const int argc, const char** argv, bool& shouldContinue)
 {
     shouldContinue = true;
-    if (!m_argument_parser.ParseArguments(argc - 1, &argv[1]))
+    if (!m_argument_parser.ParseArguments(argc, argv))
     {
         PrintUsage();
         return false;
diff --git a/src/Utils/Utils/Arguments/ArgumentParser.cpp b/src/Utils/Utils/Arguments/ArgumentParser.cpp
index 221e1f9c..135344f5 100644
--- a/src/Utils/Utils/Arguments/ArgumentParser.cpp
+++ b/src/Utils/Utils/Arguments/ArgumentParser.cpp
@@ -33,8 +33,13 @@ bool ArgumentParser::ParseArguments(std::vector<std::string>& args)
     m_matched_arguments.clear();
     m_matched_options.clear();
 
+    if (args.empty())
+        return false;
+
+    m_path = args[0];
+
     const auto argCount = args.size();
-    for (unsigned argIndex = 0; argIndex < argCount; argIndex++)
+    for (unsigned argIndex = 1u; argIndex < argCount; argIndex++)
     {
         auto& arg = args[argIndex];
 
diff --git a/src/Utils/Utils/Arguments/ArgumentParser.h b/src/Utils/Utils/Arguments/ArgumentParser.h
index 71522302..17071857 100644
--- a/src/Utils/Utils/Arguments/ArgumentParser.h
+++ b/src/Utils/Utils/Arguments/ArgumentParser.h
@@ -23,4 +23,5 @@ private:
     std::vector<const CommandLineOption*> m_command_line_options;
     std::map<const CommandLineOption*, std::vector<std::string>> m_matched_options;
     std::vector<std::string> m_matched_arguments;
+    std::string m_path;
 };
diff --git a/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp b/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp
index 0dbe00ed..e0e9902a 100644
--- a/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp
+++ b/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp
@@ -138,7 +138,7 @@ void ZoneCodeGeneratorArguments::PrintVersion()
 bool ZoneCodeGeneratorArguments::ParseArgs(const int argc, const char** argv, bool& shouldContinue)
 {
     shouldContinue = true;
-    if (!m_argument_parser.ParseArguments(argc - 1, &argv[1]))
+    if (!m_argument_parser.ParseArguments(argc, argv))
     {
         PrintUsage();
         return false;