diff --git a/contributors.yml b/contributors.yml
index cfbb9400d8..5ad6440c45 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -47,6 +47,7 @@
 - BDomzalski
 - bhbs
 - bilalk711
+- bjohn465
 - bobziroll
 - bravo-kernel
 - Brendonovich
diff --git a/integration/bug-report-test.ts b/integration/bug-report-test.ts
index 8be63c7fc2..21164ff868 100644
--- a/integration/bug-report-test.ts
+++ b/integration/bug-report-test.ts
@@ -64,27 +64,20 @@ test.beforeAll(async () => {
     // `createFixture` will make an app and run your tests against it.
     ////////////////////////////////////////////////////////////////////////////
     files: {
-      "app/routes/_index.tsx": js`
-        import { useLoaderData, Link } from "react-router";
-
+      "app/routes/map.tsx": js`
         export function loader() {
-          return "pizza";
+          return new Map([[1, 1], [2, 2], [3, 3]]);
         }
-
-        export default function Index() {
-          let data = useLoaderData();
-          return (
-            <div>
-              {data}
-              <Link to="/burgers">Other Route</Link>
-            </div>
-          )
+        export default function Map({ loaderData }) {
+          return <div>{JSON.stringify(Array.from(loaderData.entries()))}</div>;
         }
       `,
-
-      "app/routes/burgers.tsx": js`
-        export default function Index() {
-          return <div>cheeseburger</div>;
+      "app/routes/set.tsx": js`
+        export function loader() {
+          return new Set([1, 2, 3]);
+        }
+        export default function Set({ loaderData }) {
+          return <div>{JSON.stringify(Array.from(loaderData.values()))}</div>;
         }
       `,
     },
@@ -103,16 +96,19 @@ test.afterAll(() => {
 // add a good description for what you expect React Router to do 👇🏽
 ////////////////////////////////////////////////////////////////////////////////
 
-test("[description of what you expect it to do]", async ({ page }) => {
+test("Maintains correct order of Map objects when hydrating", async ({
+  page,
+}) => {
   let app = new PlaywrightFixture(appFixture, page);
   // You can test any request your app might get using `fixture`.
-  let response = await fixture.requestDocument("/");
-  expect(await response.text()).toMatch("pizza");
+  let response = await fixture.requestDocument("/map");
+  expect(await response.text()).toMatch("<div>[[1,1],[2,2],[3,3]]</div>");
 
   // If you need to test interactivity use the `app`
-  await app.goto("/");
-  await app.clickLink("/burgers");
-  await page.waitForSelector("text=cheeseburger");
+  await app.goto("/map", true);
+
+  let html = await app.getHtml();
+  expect(html).toMatch("<div>[[1,1],[2,2],[3,3]]</div>");
 
   // If you're not sure what's going on, you can "poke" the app, it'll
   // automatically open up in your browser for 20 seconds, so be quick!
@@ -121,6 +117,19 @@ test("[description of what you expect it to do]", async ({ page }) => {
   // Go check out the other tests to see what else you can do.
 });
 
+test("Maintains correct order of Set objects when hydrating", async ({
+  page,
+}) => {
+  let app = new PlaywrightFixture(appFixture, page);
+  let response = await fixture.requestDocument("/set");
+  expect(await response.text()).toMatch("<div>[1,2,3]</div>");
+
+  await app.goto("/set", true);
+
+  let html = await app.getHtml();
+  expect(html).toMatch("<div>[1,2,3]</div>");
+});
+
 ////////////////////////////////////////////////////////////////////////////////
 // 💿 Finally, push your changes to your fork of React Router
 // and open a pull request!