diff --git a/src/main/java/mi/hdm/filesystem/CSVParser.java b/src/main/java/mi/hdm/filesystem/CSVParser.java
index d755845853f87a5e06dfe58f7d20347e9356b3dc..e684e98a3dae486bee13efba03782b545b0d2afc 100644
--- a/src/main/java/mi/hdm/filesystem/CSVParser.java
+++ b/src/main/java/mi/hdm/filesystem/CSVParser.java
@@ -64,7 +64,8 @@ public class CSVParser {
         final List<Double> nutrition = new ArrayList<>();
 
         for (int i = 1; i < idx.length; i++) {
-            String element = splitLine.get(idx[i]).split(" ")[0];
+            //String element = splitLine.get(idx[i]).split(" ")[0];
+            String element = splitLine.get(idx[i]);
             double quantity = parseNumberFromString(element);
             if (getMeasurementFromString(element).equals("mg")) {
                 quantity = quantity /1000;
@@ -143,7 +144,7 @@ public class CSVParser {
         StringBuilder unit = new StringBuilder();
         for (int i = 0; i < candidate.length(); i++) {
             char c = candidate.charAt(i);
-            if (!Character.isDigit(c) && !(c == ' ')) {
+            if (!Character.isDigit(c) && !(c == ' ') && !(c == '.')) {
                 unit.append(c);
             }
         }