diff --git a/e107_handlers/date_handler.php b/e107_handlers/date_handler.php
index 2d00b5b24..4f09a97b7 100644
--- a/e107_handlers/date_handler.php
+++ b/e107_handlers/date_handler.php
@@ -87,8 +87,7 @@ class convert
 				}				
 			break;
 		}
-		
-
+	
 		return strftime($mask, $datestamp);
 	}
 
@@ -102,7 +101,7 @@ class convert
 	function convert($string=null, $mask = 'inputdate')
 	{
 		if($string == null) return false;
-		return is_integer($string) ? $this->convert_date($string, $mask) : $this->toTime($string, $mask);	
+		return is_numeric($string) ? $this->convert_date($string, $mask) : $this->toTime($string, $mask);	
 	}