diff --git a/src/View/SSTemplateParser.peg b/src/View/SSTemplateParser.peg
index 26b00e05c..2061c1879 100644
--- a/src/View/SSTemplateParser.peg
+++ b/src/View/SSTemplateParser.peg
@@ -242,7 +242,7 @@ class SSTemplateParser extends Parser implements TemplateParser
      */
     function CallArguments_Argument(&$res, $sub)
     {
-        if (!empty($res['php'])) {
+        if ($res['php'] !== '') {
             $res['php'] .= ', ';
         }
 
diff --git a/src/View/SSTemplateParser.php b/src/View/SSTemplateParser.php
index 1db0663b4..d1778c49b 100644
--- a/src/View/SSTemplateParser.php
+++ b/src/View/SSTemplateParser.php
@@ -567,7 +567,7 @@ class SSTemplateParser extends Parser implements TemplateParser
      */
     function CallArguments_Argument(&$res, $sub)
     {
-        if (!empty($res['php'])) {
+        if ($res['php'] !== '') {
             $res['php'] .= ', ';
         }
 
diff --git a/tests/php/View/SSViewerTest.php b/tests/php/View/SSViewerTest.php
index 457c64b98..da4fc3c49 100644
--- a/tests/php/View/SSViewerTest.php
+++ b/tests/php/View/SSViewerTest.php
@@ -552,6 +552,40 @@ SS;
         $this->assertEquals("SubKid1SubKid2Number6", $result, "Loop in current scope works");
     }
 
+    public function provideArgumentTypes()
+    {
+        return [
+            [
+                'arg1:0,arg2:"string",arg3:true',
+                '$methodWithTypedArguments(0, "string", true).RAW',
+            ],
+            [
+                'arg1:false,arg2:"string",arg3:true',
+                '$methodWithTypedArguments(false, "string", true).RAW',
+            ],
+            [
+                'arg1:null,arg2:"string",arg3:true',
+                '$methodWithTypedArguments(null, "string", true).RAW',
+            ],
+            [
+                'arg1:"",arg2:"string",arg3:true',
+                '$methodWithTypedArguments("", "string", true).RAW',
+            ],
+            [
+                'arg1:0,arg2:1,arg3:2',
+                '$methodWithTypedArguments(0, 1, 2).RAW',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideArgumentTypes
+     */
+    public function testArgumentTypes(string $expected, string $template)
+    {
+        $this->assertEquals($expected, $this->render($template, new TestViewableData()));
+    }
+
     public function testObjectDotArguments()
     {
         $this->assertEquals(
diff --git a/tests/php/View/SSViewerTest/TestViewableData.php b/tests/php/View/SSViewerTest/TestViewableData.php
index 03091f6f6..9817666bd 100644
--- a/tests/php/View/SSViewerTest/TestViewableData.php
+++ b/tests/php/View/SSViewerTest/TestViewableData.php
@@ -29,6 +29,11 @@ class TestViewableData extends ViewableData implements TestOnly
         return "arg1:{$arg1},arg2:{$arg2}";
     }
 
+    public function methodWithTypedArguments($arg1, $arg2, $arg3)
+    {
+        return 'arg1:' . json_encode($arg1) . ',arg2:' . json_encode($arg2) . ',arg3:' . json_encode($arg3);
+    }
+
     public function Type($arg)
     {
         return gettype($arg) . ':' . $arg;