diff --git a/src/helpers.cpp b/src/helpers.cpp
index e24a1d05..51ce3a59 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -65,11 +65,16 @@ bool ConnectToMPD()
 	return true;
 }
 
-bool ParseArgv(vector<string> &v)
+bool ParseArgv(int argc, char **argv)
 {
 	using std::cout;
 	using std::endl;
 	
+	vector<string> v;
+	v.reserve(argc-1);
+	for (int i = 1; i < argc; i++)
+		v.push_back(argv[i]);
+	
 	bool exit = 0;
 	for (vector<string>::iterator it = v.begin(); it != v.end() && !exit; it++)
 	{
diff --git a/src/helpers.h b/src/helpers.h
index ce26fa7d..e7052802 100644
--- a/src/helpers.h
+++ b/src/helpers.h
@@ -28,7 +28,7 @@
 extern ncmpcpp_config Config;
 
 bool ConnectToMPD();
-bool ParseArgv(vector<string> &);
+bool ParseArgv(int, char **);
 
 void LockStatusbar();
 void UnlockStatusbar();
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index b53b75a6..73294963 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -176,11 +176,7 @@ int main(int argc, char *argv[])
 	
 	if (argc > 1)
 	{
-		vector<string> args;
-		args.reserve(argc-1);
-		for (int i = 1; i < argc; i++)
-			args.push_back(argv[i]);
-		if (ParseArgv(args))
+		if (ParseArgv(argc, argv))
 		{
 			Mpd->Disconnect();
 			return 0;