diff --git a/.github/jetbrains.png b/.github/jetbrains.png
new file mode 100644
index 00000000..8d96653b
Binary files /dev/null and b/.github/jetbrains.png differ
diff --git a/README.md b/README.md
index 58240d3b..8d531af8 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ A Bukkit server implementation utilizing Mixin.
 | :----: |:-------:| :---: | :---: |
 | 1.18.x | 39.0.59 | ACTIVE | [![1.18 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-18?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-18) |
 | 1.17.x | 37.1.0  | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.17/1.0.2) | [![1.17 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-17?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-17) |
-| 1.16.x | 36.2.19 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) |
+| 1.16.x | 36.2.26 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) |
 | 1.15.x | 31.2.48 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.15/1.0.19) | [![1.15 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-15?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-15) |
 | 1.14.x | 28.2.0  | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.0.6) | [![1.14 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight) |
 
@@ -27,6 +27,8 @@ A Bukkit server implementation utilizing Mixin.
 
 ## Support
 
+Read [FAQ](https://github.com/IzzelAliz/Arclight/wiki/FAQ) before reporting issue.
+
 Discord server https://discord.gg/ZvTY5SC
 
 QQ Group chat 3556966
@@ -48,6 +50,8 @@ applications. YourKit is the creator of <a href="https://www.yourkit.com/java/pr
 <a href="https://www.yourkit.com/.net/profiler/">YourKit .NET Profiler</a>,
 and <a href="https://www.yourkit.com/youmonitor/">YourKit YouMonitor</a>.
 
+[![](.github/jetbrains.png)](https://www.jetbrains.com/?from=Arclight)
+
 [![](.github/nexusnode.gif)](https://nexusnode.com/minecraft.php)
 
 Get 10% off hosting server with promocode **ARCLIGHT** at [NEXUSNODE](https://nexusnode.com/minecraft.php)
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java
index 1da96c5e..562df32b 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java
@@ -3,6 +3,7 @@ package io.izzel.arclight.common.mixin.optimization.general.activationrange;
 import io.izzel.arclight.common.bridge.core.world.WorldBridge;
 import io.izzel.arclight.common.mod.ArclightConstants;
 import io.izzel.arclight.common.bridge.optimization.EntityBridge_ActivationRange;
+import io.izzel.arclight.common.mod.util.DistValidate;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.Level;
@@ -32,7 +33,7 @@ public abstract class EntityMixin_ActivationRange implements EntityBridge_Activa
     @Inject(method = "<init>", at = @At("RETURN"))
     private void arclight$init(EntityType<?> entityTypeIn, Level worldIn, CallbackInfo ci) {
         activationType = ActivationRange.initializeEntityActivationType((Entity) (Object) this);
-        if (worldIn != null) {
+        if (DistValidate.isValid(worldIn)) {
             this.defaultActivationState = ActivationRange.initializeEntityActivationState((Entity) (Object) this, ((WorldBridge) worldIn).bridge$spigotConfig());
         } else {
             this.defaultActivationState = false;