diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java
index 7fdce78f0..f3cf3302f 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java
@@ -61,7 +61,12 @@ public final class StepBiomes
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (!chunkWrapper.getStatus().isOrAfter(STATUS))
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
 			{
 				#if MC_VER < MC_1_21
 				((ProtoChunk) chunk).setStatus(STATUS);
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java
index 5ae538825..8d8bfb182 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java
@@ -59,8 +59,12 @@ public final class StepFeatures
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (!chunkWrapper.getStatus().isOrAfter(STATUS)
-				&& chunk instanceof ProtoChunk)
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
 			{
 				#if MC_VER < MC_1_21
 				((ProtoChunk) chunk).setStatus(STATUS);
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java
index e90819967..c5dc640e8 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java
@@ -59,7 +59,12 @@ public final class StepStructureReference
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (!chunkWrapper.getStatus().isOrAfter(STATUS))
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
 			{
 				#if MC_VER < MC_1_21
 				((ProtoChunk) chunk).setStatus(STATUS);
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java
index 8c53a0c12..5dcb57468 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java
@@ -76,7 +76,12 @@ public final class StepStructureStart
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (!chunkWrapper.getStatus().isOrAfter(STATUS))
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
 			{
 				#if MC_VER < MC_1_21
 				((ProtoChunk) chunk).setStatus(STATUS);
@@ -88,12 +93,12 @@ public final class StepStructureStart
 		}
 		
 		#if MC_VER < MC_1_19_2
-		if (environment.params.worldGenSettings.generateFeatures())
+		if (this.environment.params.worldGenSettings.generateFeatures())
 		{
 		#elif MC_VER < MC_1_19_4
-		if (environment.params.worldGenSettings.generateStructures()) {
+		if (this.environment.params.worldGenSettings.generateStructures()) {
 		#else
-		if (environment.params.worldOptions.generateStructures())
+		if (this.environment.params.worldOptions.generateStructures())
 		{
 		#endif
 			for (ChunkAccess chunk : chunksToDo)
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java
index 0e61d70a2..56b247783 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java
@@ -58,7 +58,12 @@ public final class StepSurface
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (!chunkWrapper.getStatus().isOrAfter(STATUS))
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
 			{
 				#if MC_VER < MC_1_21
 				((ProtoChunk) chunk).setStatus(STATUS);