diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/blocks/CharSetBlocks.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/blocks/CharSetBlocks.java
index 249b3e1b0..85ba848a6 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/blocks/CharSetBlocks.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/blocks/CharSetBlocks.java
@@ -57,7 +57,7 @@ public class CharSetBlocks extends CharBlocks implements IChunkSet {
         if (biomes == null) {
             return null;
         }
-        return biomes[y << 2 | z & 12 | x >> 2];
+        return biomes[(y >> 2) << 4 | (z & 3) << 2 | x & 3];
     }
 
     @Override
@@ -90,7 +90,7 @@ public class CharSetBlocks extends CharBlocks implements IChunkSet {
         if (biomes == null) {
             biomes = new BiomeType[1024];
         }
-        biomes[y << 2 | z & 12 | x >> 2] = biome;
+        biomes[(y >> 2) << 4 | (z & 3) << 2 | x & 3] = biome;
         return true;
     }
 
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAChunk.java b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAChunk.java
index dac042616..a4150f274 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAChunk.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAChunk.java
@@ -481,7 +481,7 @@ public class MCAChunk implements IChunk {
 
     @Override
     public BiomeType getBiomeType(int x, int y, int z) {
-        return this.biomes[y << 2 | z & 12 | x >> 2];
+        return this.biomes[(y >> 2) << 4 | (z & 3) << 2 | x & 3];
     }
 
     @Override
@@ -505,7 +505,7 @@ public class MCAChunk implements IChunk {
     @Override
     public boolean setBiome(int x, int y, int z, BiomeType biome) {
         setModified();
-        biomes[y << 2 | z & 12 | x >> 2] = biome;
+        biomes[(y >> 2) << 4 | (z & 3) << 2 | x & 3] = biome;
         return true;
     }