diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
index ec19faf5a..fd171b550 100644
--- a/core/model/build.gradle.kts
+++ b/core/model/build.gradle.kts
@@ -48,6 +48,8 @@ configure<LibraryExtension> {
         minSdk = 21
     }
 
+    testOptions { unitTests { isIncludeAndroidResources = true } }
+
     publishing { singleVariant("googleRelease") { withSourcesJar() } }
 }
 
@@ -62,6 +64,7 @@ dependencies {
 
     testImplementation(libs.androidx.core.ktx)
     testImplementation(libs.junit)
+    testImplementation(libs.robolectric)
 
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.androidx.test.runner)
diff --git a/core/model/src/main/kotlin/org/meshtastic/core/model/DataPacket.kt b/core/model/src/main/kotlin/org/meshtastic/core/model/DataPacket.kt
index 52ed43c14..e3888f862 100644
--- a/core/model/src/main/kotlin/org/meshtastic/core/model/DataPacket.kt
+++ b/core/model/src/main/kotlin/org/meshtastic/core/model/DataPacket.kt
@@ -48,9 +48,9 @@ enum class MessageStatus : Parcelable {
 @Serializable
 data class DataPacket(
     var to: String? = ID_BROADCAST, // a nodeID string, or ID_BROADCAST for broadcast
-    val bytes: ByteArray?,
+    var bytes: ByteArray?,
     // A port number for this packet (formerly called DataType, see portnums.proto for new usage instructions)
-    val dataType: Int,
+    var dataType: Int,
     var from: String? = ID_LOCAL, // a nodeID string, or ID_LOCAL for localhost
     var time: Long = System.currentTimeMillis(), // msecs since 1970
     var id: Int = 0, // 0 means unassigned
@@ -229,13 +229,11 @@ data class DataPacket(
 
     override fun describeContents(): Int = 0
 
-    // Update our object from our parcel (used for inout parameters
+    /** Update our object from our parcel (used for inout parameters) */
     fun readFromParcel(parcel: Parcel) {
         to = parcel.readString()
-        // parcel.createByteArray() // Wait, this doesn't update bytes! bytes is a VAL.
-        // Actually this method is a bit broken because it can't update val fields.
-        // But it seems only to be used for inout parameters in some places.
-        // I won't touch it unless I have to.
+        bytes = parcel.createByteArray()
+        dataType = parcel.readInt()
         from = parcel.readString()
         time = parcel.readLong()
         id = parcel.readInt()
diff --git a/core/model/src/test/kotlin/org/meshtastic/core/model/DataPacketTest.kt b/core/model/src/test/kotlin/org/meshtastic/core/model/DataPacketTest.kt
index 19d071e51..5efd7003a 100644
--- a/core/model/src/test/kotlin/org/meshtastic/core/model/DataPacketTest.kt
+++ b/core/model/src/test/kotlin/org/meshtastic/core/model/DataPacketTest.kt
@@ -16,12 +16,18 @@
  */
 package org.meshtastic.core.model
 
+import android.os.Parcel
 import kotlinx.serialization.json.Json
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
 
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [34])
 class DataPacketTest {
     @Test
     fun `DataPacket sfppHash is nullable and correctly set`() {
@@ -72,4 +78,62 @@ class DataPacketTest {
         assertNotEquals(p1, p4)
         assertNotEquals(p1.hashCode(), p3.hashCode())
     }
+
+    @Test
+    fun `readFromParcel maintains alignment and updates all fields including bytes and dataType`() {
+        val original =
+            DataPacket(
+                to = "recipient",
+                bytes = byteArrayOf(1, 2, 3),
+                dataType = 42,
+                from = "sender",
+                time = 123456789L,
+                id = 100,
+                status = MessageStatus.RECEIVED,
+                hopLimit = 3,
+                channel = 1,
+                wantAck = true,
+                hopStart = 5,
+                snr = 1.5f,
+                rssi = -90,
+                replyId = 50,
+                relayNode = 123,
+                relays = 2,
+                viaMqtt = true,
+                retryCount = 1,
+                emoji = 10,
+                sfppHash = byteArrayOf(4, 5, 6),
+            )
+
+        val parcel = Parcel.obtain()
+        original.writeToParcel(parcel, 0)
+        parcel.setDataPosition(0)
+
+        val packetToUpdate = DataPacket(to = "old", channel = 0, text = "old")
+        packetToUpdate.readFromParcel(parcel)
+
+        // Verify that all fields were updated correctly
+        assertEquals("recipient", packetToUpdate.to)
+        assertArrayEquals(byteArrayOf(1, 2, 3), packetToUpdate.bytes)
+        assertEquals(42, packetToUpdate.dataType)
+        assertEquals("sender", packetToUpdate.from)
+        assertEquals(123456789L, packetToUpdate.time)
+        assertEquals(100, packetToUpdate.id)
+        assertEquals(MessageStatus.RECEIVED, packetToUpdate.status)
+        assertEquals(3, packetToUpdate.hopLimit)
+        assertEquals(1, packetToUpdate.channel)
+        assertEquals(true, packetToUpdate.wantAck)
+        assertEquals(5, packetToUpdate.hopStart)
+        assertEquals(1.5f, packetToUpdate.snr)
+        assertEquals(-90, packetToUpdate.rssi)
+        assertEquals(50, packetToUpdate.replyId)
+        assertEquals(123, packetToUpdate.relayNode)
+        assertEquals(2, packetToUpdate.relays)
+        assertEquals(true, packetToUpdate.viaMqtt)
+        assertEquals(1, packetToUpdate.retryCount)
+        assertEquals(10, packetToUpdate.emoji)
+        assertArrayEquals(byteArrayOf(4, 5, 6), packetToUpdate.sfppHash)
+
+        parcel.recycle()
+    }
 }