diff --git a/SpreadSheetPlugin/lib/Foswiki/Plugins/SpreadSheetPlugin/Calc.pm b/SpreadSheetPlugin/lib/Foswiki/Plugins/SpreadSheetPlugin/Calc.pm
index 18b52800e..afa30329d 100644
--- a/SpreadSheetPlugin/lib/Foswiki/Plugins/SpreadSheetPlugin/Calc.pm
+++ b/SpreadSheetPlugin/lib/Foswiki/Plugins/SpreadSheetPlugin/Calc.pm
@@ -1739,9 +1739,9 @@ sub _safeEvalPerl {
     $theText = $1;                               # untainted variable
 
     # disable glob for security reasons
-    $theText =~ s/^([\(\s]*)\<+/$1/g;
-    $theText =~ s/\>+([\s\)]*)$/$1/g;
-    $theText =~ s/\<[\.\*\/\?\s]*\>/ /g;
+    while ( $theText =~ s/\<[\.\*\/\?\se]*\>/ /g ) {
+        1;
+    }
 
     return "" unless defined($theText);
 
diff --git a/SpreadSheetPlugin/test/unit/SpreadSheetPlugin/SpreadSheetPluginTests.pm b/SpreadSheetPlugin/test/unit/SpreadSheetPlugin/SpreadSheetPluginTests.pm
index af73306e6..4d778ddd8 100755
--- a/SpreadSheetPlugin/test/unit/SpreadSheetPlugin/SpreadSheetPluginTests.pm
+++ b/SpreadSheetPlugin/test/unit/SpreadSheetPlugin/SpreadSheetPluginTests.pm
@@ -437,11 +437,13 @@ sub test_EVAL {
 sub test_EVAL_GLOB {
     my ($this) = @_;
 
-    $this->assert( $this->CALC('$EVAL(<*>)')               =~ /^ERROR:/ );
-    $this->assert( $this->CALC('$EVAL((<*>))')             =~ /^ERROR:/ );
-    $this->assert( $this->CALC('$EVAL(< * >)')             =~ /^ERROR:/ );
-    $this->assert( $this->CALC('$EVAL(<../../../ee*/* >)') =~ /^ERROR:/ );
     $this->assert( $this->CALC('$EVAL(<>)') == 0 );
+    $this->assert( $this->CALC('$EVAL(<<>>)') == 0 );
+    $this->assert( $this->CALC('$EVAL(<<<>>>)') == 0 );
+    $this->assert( $this->CALC('$EVAL(<*>)') == 0 );
+    $this->assert( $this->CALC('$EVAL((<*>))') == 0 );
+    $this->assert( $this->CALC('$EVAL(< * >)') == 0 );
+    $this->assert( $this->CALC('$EVAL(<../../../ee*/* >)') == 0 );
     $this->assert( $this->CALC('$EVAL(2+<>+2)') == 4 );
     $this->assert( $this->CALC('$EVAL(2+<   >+2)') == 4 );
     $this->assert( $this->CALC('$EVAL(%+.<*>.2)') =~ /^ERROR:/ );
@@ -450,6 +452,8 @@ sub test_EVAL_GLOB {
     $this->assert( $this->CALC('$EVAL(%-.<*>.2)')    =~ /^ERROR:/ );
     $this->assert( $this->CALC('$EVAL(%+.<../*>.2)') =~ /^ERROR:/ );
     $this->assert( $this->CALC('$EVAL(3-<../*>-3)') == 6 );
+    $this->assert( $this->CALC('$EVAL(%-.<ee*/..>.%-)') =~ /^ERROR:/ );
+    $this->assert( $this->CALC('$EVAL(%-.<<>../*>.%-)') =~ /^ERROR:/ );
 }
 
 sub test_EVEN {