diff --git a/scripts/conll18_ud_eval.py b/scripts/conll18_ud_eval.py
index 123f25265b6785592e683dc887bb0f0aa07239b1..813188c9f6ea230443c387ef89ce4bc91975da5a 100755
--- a/scripts/conll18_ud_eval.py
+++ b/scripts/conll18_ud_eval.py
@@ -372,8 +372,8 @@ def evaluate(gold_ud, system_ud, extraColumns) :
       if isNumeric :
         self.precision = 0
         self.recall = R2
-        self.f1 = correct[1] / gold_total if gold_total else 0.0
-        self.aligned_accuracy = correct[0] / gold_total if gold_total else 0.0
+        self.f1 = correct[1]
+        self.aligned_accuracy = correct[0]
 
       else :
         self.precision = 100*correct[0] / system_total if system_total else 0.0
@@ -457,6 +457,8 @@ def evaluate(gold_ud, system_ud, extraColumns) :
 
     R2 = None
     if isNumericOnly :
+      correct[0] /= len(goldValues)
+      correct[1] /= len(goldValues)
       goldMean = sum(goldValues) / len(goldValues)
       predMean = sum(predictedValues) / len(predictedValues)
       numerator = 0.0