diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
index dfd339f8eb..c7fb628568 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
@@ -36,7 +36,7 @@ public class CloudLocationInfo implements Parcelable {
         this.lon = info.getLon();
         this.heading = info.getHeading();
         this.systemTime = System.currentTimeMillis();
-        this.satelliteTime = System.currentTimeMillis();
+        this.satelliteTime = info.getSatelliteTime();
         this.alt = info.alt;
         this.speed = info.speed;
     }
@@ -49,44 +49,6 @@ public class CloudLocationInfo implements Parcelable {
         }
     }
 
-    protected CloudLocationInfo( Parcel in ) {
-        lat = in.readDouble();
-        lon = in.readDouble();
-        heading = in.readDouble();
-        systemTime = in.readLong();
-        satelliteTime = in.readLong();
-        alt = in.readDouble();
-        speed = in.readDouble();
-    }
-
-    @Override
-    public void writeToParcel( Parcel dest, int flags ) {
-        dest.writeDouble( lat );
-        dest.writeDouble( lon );
-        dest.writeDouble( heading );
-        dest.writeLong( systemTime );
-        dest.writeLong( satelliteTime );
-        dest.writeDouble( alt );
-        dest.writeDouble( speed );
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    public static final Creator< CloudLocationInfo > CREATOR = new Creator< CloudLocationInfo >() {
-        @Override
-        public CloudLocationInfo createFromParcel( Parcel in ) {
-            return new CloudLocationInfo( in );
-        }
-
-        @Override
-        public CloudLocationInfo[] newArray( int size ) {
-            return new CloudLocationInfo[size];
-        }
-    };
-
     public double getLat() {
         return lat;
     }
@@ -178,4 +140,44 @@ public class CloudLocationInfo implements Parcelable {
     public int hashCode() {
         return Objects.hash( lat, lon );
     }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel( Parcel dest, int flags ) {
+        dest.writeDouble( this.lat );
+        dest.writeDouble( this.lon );
+        dest.writeDouble( this.heading );
+        dest.writeLong( this.systemTime );
+        dest.writeLong( this.satelliteTime );
+        dest.writeDouble( this.alt );
+        dest.writeDouble( this.speed );
+        dest.writeInt( this.vehicleType );
+    }
+
+    protected CloudLocationInfo( Parcel in ) {
+        this.lat = in.readDouble();
+        this.lon = in.readDouble();
+        this.heading = in.readDouble();
+        this.systemTime = in.readLong();
+        this.satelliteTime = in.readLong();
+        this.alt = in.readDouble();
+        this.speed = in.readDouble();
+        this.vehicleType = in.readInt();
+    }
+
+    public static final Creator< CloudLocationInfo > CREATOR = new Creator< CloudLocationInfo >() {
+        @Override
+        public CloudLocationInfo createFromParcel( Parcel source ) {
+            return new CloudLocationInfo( source );
+        }
+
+        @Override
+        public CloudLocationInfo[] newArray( int size ) {
+            return new CloudLocationInfo[size];
+        }
+    };
 }