diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java
index fb2c2b54..f58d6399 100644
--- a/src/main/java/ru/betterend/BetterEnd.java
+++ b/src/main/java/ru/betterend/BetterEnd.java
@@ -39,9 +39,6 @@ public class BetterEnd implements ModInitializer {
 	public static final Logger LOGGER = Logger.get();
 	@Override
 	public void onInitialize() {
-		TerrainGenerator.init();
-		GeneratorOptions.init();
-		
 		EndSounds.register();
 		EndItems.register();
 		EndBlocks.register();
@@ -63,6 +60,8 @@ public class BetterEnd implements ModInitializer {
 		EndStructures.register();
 		Integrations.register();
 		BonemealUtil.init();
+		TerrainGenerator.init();
+		GeneratorOptions.init();
 		
 		if (hasGuideBook()) {
 			GuideBookItem.register();
diff --git a/src/main/java/ru/betterend/config/ConfigKeeper.java b/src/main/java/ru/betterend/config/ConfigKeeper.java
index cdc10b84..5c951bd6 100644
--- a/src/main/java/ru/betterend/config/ConfigKeeper.java
+++ b/src/main/java/ru/betterend/config/ConfigKeeper.java
@@ -56,7 +56,7 @@ public final class ConfigKeeper {
 		String paramKey = key.getEntry();
 		paramKey += " [default: " + entry.getDefault() + "]";
 		
-		this.changed = entry.setLocation(obj, paramKey);
+		this.changed |= entry.setLocation(obj, paramKey);
 	}
 	
 	private <T, E extends Entry<T>> void storeValue(E entry, T value) {