1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/database/DriversManager.java b/src/org/traccar/database/DriversManager.java
index 9defa1931..930951460 100644
--- a/src/org/traccar/database/DriversManager.java
+++ b/src/org/traccar/database/DriversManager.java
@@ -23,7 +23,7 @@ import org.traccar.model.Driver;
 
 public class DriversManager extends ExtendedObjectManager<Driver> {
 
-    private Map<String, Long> driversByUniqueId;
+    private Map<String, Driver> driversByUniqueId;
 
     public DriversManager(DataManager dataManager) {
         super(dataManager, Driver.class);
@@ -36,7 +36,7 @@ public class DriversManager extends ExtendedObjectManager<Driver> {
         if (driversByUniqueId == null) {
             driversByUniqueId = new ConcurrentHashMap<>(getAllItems().size());
         }
-        driversByUniqueId.put(driver.getUniqueId(), driver.getId());
+        driversByUniqueId.put(driver.getUniqueId(), driver);
     }
 
     @Override
@@ -68,6 +68,6 @@ public class DriversManager extends ExtendedObjectManager<Driver> {
     }
 
     public Driver getDriverByUniqueId(String uniqueId) {
-        return getById(driversByUniqueId.get(uniqueId));
+        return driversByUniqueId.get(uniqueId);
     }
 }