diff --git a/extensions/DatatypeTrait.php b/extensions/DatatypeTrait.php
index 6a242b1..7d5359f 100644
--- a/extensions/DatatypeTrait.php
+++ b/extensions/DatatypeTrait.php
@@ -36,7 +36,7 @@ trait DatatypeTrait {
             return 'integer';
         }
 
-        if (preg_match('/^[+-]?([0-9]*[.])?([0-9]|[.][0-9])+$/', $value)) {
+        if (preg_match('/(^[+-]?$)|(^[+-]?[0-9]+([,.][0-9])?[0-9]*(e[+-]?[0-9]+)?$)/', $value)) {
             return 'float';
         }