diff --git a/src/InputOutput/IHMImpl/Tools/CommonClass.php b/src/InputOutput/IHMImpl/Tools/CommonClass.php
index 9b32287..f4bddbe 100644
--- a/src/InputOutput/IHMImpl/Tools/CommonClass.php
+++ b/src/InputOutput/IHMImpl/Tools/CommonClass.php
@@ -39,11 +39,25 @@ class CommonClass
 	public static function isoToTimeStampWithMls($iso)
 	{
 		date_default_timezone_set('UTC');
+		$iso = trim($iso);
+		if (empty($iso)) {
+			return 0.;
+		}
+		else if ($iso[strlen($iso)-1] == 'Z') {
+			$iso = substr($iso, 0, -1);
+		}
 		$date = DateTime::createFromFormat('Y-m-d\TH:i:s.v', $iso);
 		if ($date !== FALSE) {
 			return round(floatval($date->format('v'))/1000. + $date->getTimestamp(),3);
 		}
 		$date = DateTime::createFromFormat('Y-m-d\TH:i:s', $iso);
+		if ($date !== FALSE) {
+			return round(floatval($date->getTimestamp()),3);
+		}
+		$date = DateTime::createFromFormat('Y-m-d\TH:i', $iso);
+		if ($date === FALSE) {
+			return 0.;
+		}
 		return round(floatval($date->getTimestamp()),3);
 	}
         
--
libgit2 0.21.2