diff --git a/src/cdo.c b/src/cdo.c
index 0f8ccf6..e5f1118 100644
--- a/src/cdo.c
+++ b/src/cdo.c
@@ -21,5 +21,6 @@ int main (int argc, char *argv[]) {
   LOG_INFO("Project full path: %s", full_path);
   identify_platfrom_from_project(full_path);
   cdo_free((void*)full_path);
+  free_arg_list(args);
   return 0;
 }
diff --git a/src/cmd.c b/src/cmd.c
index 092c47a..ad7b11a 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -143,7 +143,7 @@ const char* extract_value_from_arg(struct ArgList* list, ArgNameId id) {
 }
 
 void free_arg_list(struct ArgList* list) {
-    for (size_t i = 0; i < ARG_COUNT; i++) {
+    for (size_t i = 0; i < list->size; i++) {
         cdo_free(list->args[i].name);
         cdo_free(list->args[i].description);
         cdo_free(list->args[i].value);