diff --git a/src/Command.cpp b/src/Command.cpp
index 74ef49c8c4..3a5df0c9e9 100644
--- a/src/Command.cpp
+++ b/src/Command.cpp
@@ -4,7 +4,7 @@
 #include "RageLog.h"
 #include "arch/Dialog/Dialog.h"
 #include "Foreach.h"
-
+#include <numeric>
 
 RString Command::GetName() const 
 {
@@ -81,10 +81,14 @@ static void SplitWithQuotes( const RString sSource, const char Delimitor, vector
 
 RString Commands::GetOriginalCommandString() const
 {
+#ifdef MACOSX
 	RString s;
-	FOREACH_CONST( Command, v, c )
-		s += c->GetOriginalCommandString();
+	for (Command const &c : v)
+		s += c.GetOriginalCommandString();
 	return s;
+#else
+	return std::accumulate(v.begin(), v.end(), RString(), [](RString &res, Command const &c) { return res += c.GetOriginalCommandString(); });
+#endif
 }
 
 void ParseCommands( const RString &sCommands, Commands &vCommandsOut )