diff --git a/include/class.osticket.php b/include/class.osticket.php
index db48388e03dc852c9a9ddc06ffe9c9bf7a030211..a8133f159a3c55aec8f940c7a2cd7680e0713849 100644
--- a/include/class.osticket.php
+++ b/include/class.osticket.php
@@ -436,7 +436,7 @@ class osTicket {
             switch ($info['v']) {
             case '1':
                 if ($major && $info['m'] && $info['m'] != $major)
-                    continue;
+                    continue 2;
                 if ($product == 'core' && GIT_VERSION == '$git')
                     return $info['c'];
                 return $info['V'];
diff --git a/include/cli/modules/i18n.php b/include/cli/modules/i18n.php
index a20c8329db306d65fb284e3f0f29c62a7f71b62a..733bcb68c4a7be9e13511546af588ada9d75665b 100644
--- a/include/cli/modules/i18n.php
+++ b/include/cli/modules/i18n.php
@@ -417,7 +417,7 @@ class i18n_Compiler extends Module {
                     break;
                 case T_WHITESPACE:
                     // noop
-                    continue;
+                    continue 2;
                 case T_STRING_VARNAME:
                 case T_NUM_STRING:
                 case T_ENCAPSED_AND_WHITESPACE:
@@ -472,7 +472,7 @@ class i18n_Compiler extends Module {
         while (list(,$T) = each($tokens)) {
             switch ($T[0]) {
             case T_WHITESPACE:
-                continue;
+                continue 2;
             case '(':
                 return $this->__read_args($tokens, $args);
             default:
@@ -500,7 +500,7 @@ class i18n_Compiler extends Module {
                     break;
                 }
                 if (!isset($funcs[$T[1]]))
-                    continue;
+                    continue 2;
                 $constants = $funcs[$T[1]];
                 if ($info = $this->__get_func_args($tokens, $constants))
                     $T_funcs[] = $info;
@@ -519,7 +519,7 @@ class i18n_Compiler extends Module {
                         case '@trans':
                             $translate = true;
                         default:
-                            continue;
+                            continue 2;
                         }
                     }
                 }