diff --git a/lib/pangea/extensions/room_events_extension.dart b/lib/pangea/extensions/room_events_extension.dart
index b357593a9..d7712c0d7 100644
--- a/lib/pangea/extensions/room_events_extension.dart
+++ b/lib/pangea/extensions/room_events_extension.dart
@@ -248,7 +248,7 @@ extension EventsRoomExtension on Room {
       }
     }
 
-    final fullBody = _getEventContent(event, inReplyTo, editEventId);
+    final fullBody = _getEventContent(Map.from(event), inReplyTo, editEventId);
     final jsonString = jsonEncode(fullBody);
     final jsonSizeInBytes = utf8.encode(jsonString).length;
     const maxBodySize = 60000;
diff --git a/pangea_packages/fcm_shared_isolate/example/test/widget_test.dart b/pangea_packages/fcm_shared_isolate/example/test/widget_test.dart
index 3e83d9d80..6401ff6b5 100644
--- a/pangea_packages/fcm_shared_isolate/example/test/widget_test.dart
+++ b/pangea_packages/fcm_shared_isolate/example/test/widget_test.dart
@@ -8,7 +8,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:fcm_shared_isolate_example/main.dart';
+import '../lib/main.dart';
 
 void main() {
   testWidgets('Verify Platform version', (WidgetTester tester) async {