diff --git a/obj.go b/obj.go
index 7ad9c67..8953784 100644
--- a/obj.go
+++ b/obj.go
@@ -337,7 +337,7 @@ func addObjMsg(m ChatWarsMessage) (int64, error) {
 
 	}
 
-	cacheObjMsg.Store(objId, *m)
+	cacheObjMsg.Store(objId, *msg)
 
 	return objId, nil
 }
diff --git a/workers.go b/workers.go
index 2350517..4e73670 100644
--- a/workers.go
+++ b/workers.go
@@ -318,7 +318,7 @@ func SQLCWMsgWorker(id int, msgs <-chan ChatWarsMessage, objIds chan<- int64) {
 				log.Printf("SQLCWMsgWorker[%d] (%d) : Callback : %s : %s\n", id, m.ID64, c.Name, string(c.Data))
 			}
 		}
-		objId, err := addObjMsg(m.ID64, m.ChatID64, m.TGUserID64, m.TGSenderUserID64, m.Date, m.Text)
+		objId, err := addObjMsg(m)
 		logOnError(err, "SQLCWMsgWorker["+strconv.Itoa(id)+"] : Inserting message.")
 		if err == nil && objId != 0 {
 			// log.Printf("SQLCWMsgWorker["+strconv.Itoa(id)+"] : Message inserted (%d).\n", objId)