1 files changed, 5 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/org/traccar/protocol/MeitrackProtocolDecoder.java
index 2b8460fc7..4bde5cf75 100644
--- a/src/org/traccar/protocol/MeitrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeitrackProtocolDecoder.java
@@ -119,10 +119,10 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder {
 
         position.set(Event.KEY_ODOMETER, parser.next());
         position.set("runtime", parser.next());
-        position.set(Event.KEY_MCC, parser.next());
-        position.set(Event.KEY_MCC, parser.next());
-        position.set(Event.KEY_LAC, parser.next());
-        position.set(Event.KEY_CID, parser.next());
+        position.set(Event.KEY_MCC, parser.nextInt());
+        position.set(Event.KEY_MNC, parser.nextInt());
+        position.set(Event.KEY_LAC, parser.nextInt(16));
+        position.set(Event.KEY_CID, parser.nextInt(16));
         position.set(Event.KEY_STATUS, parser.next());
 
         for (int i = 1; i <= 3; i++) {
@@ -196,7 +196,7 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder {
             position.set(Event.KEY_ODOMETER, buf.readUnsignedInt());
             position.set("runtime", buf.readUnsignedInt());
             position.set(Event.KEY_MCC, buf.readUnsignedShort());
-            position.set(Event.KEY_MCC, buf.readUnsignedShort());
+            position.set(Event.KEY_MNC, buf.readUnsignedShort());
             position.set(Event.KEY_LAC, buf.readUnsignedShort());
             position.set(Event.KEY_CID, buf.readUnsignedShort());
             position.set(Event.KEY_STATUS, buf.readUnsignedShort());