diff --git a/config.xml b/config.xml
index fe5d3e3..4d76148 100755
--- a/config.xml
+++ b/config.xml
@@ -2,11 +2,11 @@
 <module>
 	<name>statslive</name>
 	<displayName><![CDATA[Visitors online]]></displayName>
-	<version><![CDATA[2.0.2]]></version>
+	<version><![CDATA[2.1.0]]></version>
 	<description><![CDATA[Adds a list of customers and visitors who are currently online to the Stats dashboard.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[analytics_stats]]></tab>
 	<is_configurable>0</is_configurable>
 	<need_instance>0</need_instance>
 	<limited_countries></limited_countries>
-</module>
\ No newline at end of file
+</module>
diff --git a/statslive.php b/statslive.php
index fe4ac1f..08cb979 100644
--- a/statslive.php
+++ b/statslive.php
@@ -36,7 +36,7 @@ public function __construct()
     {
         $this->name = 'statslive';
         $this->tab = 'analytics_stats';
-        $this->version = '2.0.2';
+        $this->version = '2.1.0';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
 
@@ -73,7 +73,7 @@ private function getCustomersOnline()
 					INNER JOIN `'._DB_PREFIX_.'customer` u ON u.id_customer = g.id_customer
 					WHERE cp.`time_end` IS NULL
 						'.Shop::addSqlRestriction(false, 'c').'
-						AND TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', cp.`time_start`)) < 900
+						AND cp.`time_start` > NOW() - INTERVAL 15 MINUTE
 					'.($maintenance_ips ? 'AND c.ip_address NOT IN ('.preg_replace('/[^,0-9]/', '', $maintenance_ips).')' : '').'
 					GROUP BY u.id_customer
 					ORDER BY u.firstname, u.lastname';
@@ -82,7 +82,7 @@ private function getCustomersOnline()
 					FROM `'._DB_PREFIX_.'connections` c
 					INNER JOIN `'._DB_PREFIX_.'guest` g ON c.id_guest = g.id_guest
 					INNER JOIN `'._DB_PREFIX_.'customer` u ON u.id_customer = g.id_customer
-					WHERE TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', c.`date_add`)) < 900
+					WHERE c.`date_add` > NOW() - INTERVAL 15 MINUTE
 						'.Shop::addSqlRestriction(false, 'c').'
 					'.($maintenance_ips ? 'AND c.ip_address NOT IN ('.preg_replace('/[^,0-9]/', '', $maintenance_ips).')' : '').'
 					GROUP BY u.id_customer
@@ -114,7 +114,7 @@ private function getVisitorsOnline()
 					WHERE (g.id_customer IS NULL OR g.id_customer = 0)
 						'.Shop::addSqlRestriction(false, 'c').'
 						AND cp.`time_end` IS NULL
-					AND TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', cp.`time_start`)) < 900
+					AND cp.`time_start` > NOW() - INTERVAL 15 MINUTE
 					'.($maintenance_ips ? 'AND c.ip_address NOT IN ('.preg_replace('/[^,0-9]/', '', $maintenance_ips).')' : '').'
 					GROUP BY c.id_connections
 					ORDER BY c.date_add DESC';
@@ -124,7 +124,7 @@ private function getVisitorsOnline()
 					INNER JOIN `'._DB_PREFIX_.'guest` g ON c.id_guest = g.id_guest
 					WHERE (g.id_customer IS NULL OR g.id_customer = 0)
 						'.Shop::addSqlRestriction(false, 'c').'
-						AND TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', c.`date_add`)) < 900
+						AND c.`date_add` > NOW() - INTERVAL 15 MINUTE
 					'.($maintenance_ips ? 'AND c.ip_address NOT IN ('.preg_replace('/[^,0-9]/', '', $maintenance_ips).')' : '').'
 					ORDER BY c.date_add DESC';
         }