diff --git a/PHP/CodeCoverage/Report/Clover.php b/PHP/CodeCoverage/Report/Clover.php
index 05f9eee43..a5f3c47b6 100644
--- a/PHP/CodeCoverage/Report/Clover.php
+++ b/PHP/CodeCoverage/Report/Clover.php
@@ -102,47 +102,26 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                 $classStatements        = 0;
                 $coveredClassStatements = 0;
                 $coveredMethods         = 0;
+                $classMethods           = 0;
 
                 foreach ($class['methods'] as $methodName => $method) {
-                    $methodCount        = 0;
-                    $methodLines        = 0;
-                    $methodLinesCovered = 0;
+                    if ($method['executableLines']  == 0)
+                        continue;
 
+                    $classMethods++;
+                    $classStatements        += $method['executableLines'];
+                    $coveredClassStatements += $method['executedLines'];
+                    if ($method['coverage'] == 100){
+                        $coveredMethods++;
+                    }
+
+                    $methodCount = 0;
                     for ($i  = $method['startLine'];
                          $i <= $method['endLine'];
                          $i++) {
-                        $add   = TRUE;
-                        $count = 0;
-
-                        if (isset($coverage[$i])) {
-                            if ($coverage[$i] !== NULL) {
-                                $classStatements++;
-                                $methodLines++;
-                            } else {
-                                $add = FALSE;
-                            }
-
-                            $count = count($coverage[$i]);
-
-                            if ($count > 0) {
-                                $coveredClassStatements++;
-                                $methodLinesCovered++;
-                            }
-                        } else {
-                            $add = FALSE;
+                        if (isset($coverage[$i]) && ($coverage[$i] !== NULL)) {
+                            $methodCount = max($methodCount, count($coverage[$i]));
                         }
-
-                        $methodCount = max($methodCount, $count);
-
-                        if ($add) {
-                            $lines[$i] = array(
-                              'count' => $count, 'type'  => 'stmt'
-                            );
-                        }
-                    }
-
-                    if ($methodCount > 0) {
-                        $coveredMethods++;
                     }
 
                     $lines[$method['startLine']] = array(
@@ -188,7 +167,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                 $xmlFile->appendChild($xmlClass);
 
                 $xmlMetrics = $xmlDocument->createElement('metrics');
-                $xmlMetrics->setAttribute('methods', count($class['methods']));
+                $xmlMetrics->setAttribute('methods', $classMethods);
                 $xmlMetrics->setAttribute('coveredmethods', $coveredMethods);
                 $xmlMetrics->setAttribute('conditionals', 0);
                 $xmlMetrics->setAttribute('coveredconditionals', 0);
@@ -198,7 +177,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                 );
                 $xmlMetrics->setAttribute(
                   'elements',
-                  count($class['methods']) +
+                  $classMethods +
                   $classStatements
                   /* + conditionals */);
                 $xmlMetrics->setAttribute(
diff --git a/Tests/_files/class-with-anonymous-function-clover.xml b/Tests/_files/class-with-anonymous-function-clover.xml
index 11e9c1856..841df2d69 100644
--- a/Tests/_files/class-with-anonymous-function-clover.xml
+++ b/Tests/_files/class-with-anonymous-function-clover.xml
@@ -3,7 +3,7 @@
   <project timestamp="%i">
     <file name="%s/source_with_class_and_anonymous_function.php">
       <class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
-        <metrics methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="12" coveredstatements="11" elements="14" coveredelements="13"/>
+        <metrics methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="6" coveredstatements="5" elements="8" coveredelements="6"/>
       </class>
       <line num="5" type="method" name="runAnonymous" crap="1.04" count="1"/>
       <line num="7" type="stmt" count="1"/>
diff --git a/Tests/_files/ignored-lines-clover.xml b/Tests/_files/ignored-lines-clover.xml
index 4da74483c..f63204002 100644
--- a/Tests/_files/ignored-lines-clover.xml
+++ b/Tests/_files/ignored-lines-clover.xml
@@ -3,15 +3,13 @@
   <project timestamp="%i">
     <file name="%s/source_with_ignore.php">
       <class name="Foo" namespace="global">
-        <metrics methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="1" coveredelements="0"/>
+        <metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
       </class>
       <class name="Bar" namespace="global">
-        <metrics methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="1" coveredelements="0"/>
+        <metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
       </class>
       <line num="2" type="stmt" count="1"/>
       <line num="6" type="stmt" count="0"/>
-      <line num="13" type="method" name="bar" crap="1" count="0"/>
-      <line num="23" type="method" name="foo" crap="1" count="0"/>
       <metrics loc="38" ncloc="26" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
     </file>
     <metrics files="1" loc="38" ncloc="26" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>