diff --git a/hwe/sammo/VersionGitDynamic.php b/hwe/sammo/VersionGitDynamic.php
index 6ce77a28..bd8642a4 100644
--- a/hwe/sammo/VersionGitDynamic.php
+++ b/hwe/sammo/VersionGitDynamic.php
@@ -18,7 +18,7 @@ class VersionGitDynamic
         exec($command, $output);
         if (is_array($output)) {
             if (count($output)) {
-                $output = $output[1];
+                $output = Util::array_last($output);
                 $output = trim($output, " \t\n\r\0\x0b*");
                 $output = explode('/', $output);
                 $versionTokens[] = Util::array_last($output);
diff --git a/j_updateServer.php b/j_updateServer.php
index 7f5b5484..3fd1585a 100644
--- a/j_updateServer.php
+++ b/j_updateServer.php
@@ -28,7 +28,7 @@ function getVersion($target = null)
     exec($command, $output);
     if (is_array($output)) {
         if (count($output)) {
-            $output = $output[1];
+            $output = Util::array_last($output);
             $output = trim($output, " \t\n\r\0\x0b*");
             $output = explode('/', $output);
             $versionTokens[] = Util::array_last($output);