Merge https://github.com/Crimoxic/NoxicCore/commit/19a4a3731686c9ac0d1c50a5a0bbcd9ff0088d94