diff --git a/workers.go b/workers.go
index 1f4f2b2..842f93f 100644
--- a/workers.go
+++ b/workers.go
@@ -139,6 +139,9 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) {
 					err = setObjSubTypeId(objId, objSubTypeMessagePillageLoss)
 					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(PillageLoss)")
 				case objSubTypeMessageDuelFight:
+					cwm, err := parseSubTypeMessageDuelFight(m, r)
+					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Parsing objSubTypeMessageDuelFight.")
+					cwm.ObjID64 = objId
 					err = setObjSubTypeId(objId, objSubTypeMessageDuelFight)
 					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(DuelFight)")
 				case objSubTypeMessageQuest:
@@ -148,9 +151,6 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) {
 					err = setObjSubTypeId(objId, objSubTypeMessageGoQuest)
 					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(GoQuest)")
 				case objSubTypeMessageArena:
-					cwm, err := parseSubTypeMessageArena(m, r)
-					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Parsing objSubTypeMessageArena.")
-					cwm.ObjID64 = objId
 					err = setObjSubTypeId(objId, objSubTypeMessageArena)
 					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(Arena)")
 				case objSubTypeMessageGoArena: