diff --git a/Resources/views/CustomFieldsGroup/render.html.twig b/Resources/views/CustomFieldsGroup/render.html.twig
index fb293cf92..f726aa51d 100644
--- a/Resources/views/CustomFieldsGroup/render.html.twig
+++ b/Resources/views/CustomFieldsGroup/render.html.twig
@@ -22,7 +22,7 @@
             {%- endif -%}
         {%- endif -%}
     {% else %}
-        {%- if show_empty == true or (chill_custom_field_is_empty(customField, cFData) == false) -%}
+        {%- if show_empty == true or (chill_custom_field_is_empty(cFData, customField) == false) -%}
             {%- if title is not empty -%}
                 {{ chill_custom_field_widget(cFData, title) }}
                 {%- set title = null -%}
diff --git a/Templating/Twig/CustomFieldRenderingTwig.php b/Templating/Twig/CustomFieldRenderingTwig.php
index 32246cbd7..de13b8efb 100644
--- a/Templating/Twig/CustomFieldRenderingTwig.php
+++ b/Templating/Twig/CustomFieldRenderingTwig.php
@@ -85,7 +85,7 @@ class CustomFieldRenderingTwig extends \Twig_Extension implements ContainerAware
     }
     
     
-    public function isEmptyValue(CustomField $customField, $fields, $slug = null)
+    public function isEmptyValue($fields, CustomField $customField)
     {
         return $this->container->get('chill.custom_field.helper')
             ->isEmptyValue($fields, $customField);
diff --git a/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php b/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
index 7f4923349..2f6f51df7 100644
--- a/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
+++ b/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
@@ -102,4 +102,27 @@ class CustomFieldRenderingTwigTest extends KernelTestCase
         $this->assertContains('My tailor is rich', $text,
               "The rendering text should contains the 'test' text");
     }
+    
+    public function testIsEmpty()
+    {
+        $cf = $this->getSimpleCustomFieldText();
+        
+        // value is not empty
+        $fields = array(
+           'test' => "My tailor is rich"
+        );
+        
+        $result = $this->cfRendering->isEmptyValue($fields, $cf);
+        
+        $this->assertFalse($result);
+        
+        // value is empty
+        $fields = array(
+           'text' => ''
+        );
+        
+        $result = $this->cfRendering->isEmptyValue($fields, $cf);
+        
+        $this->assertTrue($result);
+    }
 }