diff --git a/Spigot-Server-Patches/Fix-nether-portal-creation.patch b/Spigot-Server-Patches/Fix-nether-portal-creation.patch
index a0f86a0cfb..4c64bcca67 100644
--- a/Spigot-Server-Patches/Fix-nether-portal-creation.patch
+++ b/Spigot-Server-Patches/Fix-nether-portal-creation.patch
@@ -19,4 +19,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper end
          CraftBlockState state = CraftBlockState.getBlockState(world, position, flag);
          state.setData(data);
-         list.put(position, state);
+         // remove first to keep insertion order
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6f55b5b888..95544a2da8 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6f55b5b8883b1bd2a8661478e078be359fad1294
+Subproject commit 95544a2da8707a3b3ee758e346da9ab063f1dbb2