diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index 46c784562..f761b8c91 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -1755,6 +1755,7 @@ class Level implements ChunkManager, Metadatable{
 	public function generateChunkCallback($x, $z, FullChunk $chunk){
 		$oldChunk = $this->getChunk($x, $z, false);
 		unset($this->chunkGenerationQueue[Level::chunkHash($x, $z)]);
+		$chunk->setProvider($this->provider);
 		$this->setChunk($x, $z, $chunk);
 		if($chunk !== null and ($oldChunk === null or $oldChunk->isPopulated() === false) and $chunk->isPopulated()){
 			$this->server->getPluginManager()->callEvent(new ChunkPopulateEvent($chunk));
diff --git a/src/pocketmine/level/generator/GenerationChunkManager.php b/src/pocketmine/level/generator/GenerationChunkManager.php
index 40bf3a3ab..e9c1d3c0a 100644
--- a/src/pocketmine/level/generator/GenerationChunkManager.php
+++ b/src/pocketmine/level/generator/GenerationChunkManager.php
@@ -163,7 +163,7 @@ class GenerationChunkManager implements ChunkManager{
 		try{
 			$chunk = $this->getChunk($chunkX, $chunkZ);
 			$chunk->setGenerated(true);
-			$this->changes["$chunkX:$chunkZ"] = $chunk;
+			$this->changes[Level::chunkHash($chunkX, $chunkZ)] = $chunk;
 		}catch(\Exception $e){
 		}
 	}
@@ -172,7 +172,7 @@ class GenerationChunkManager implements ChunkManager{
 		try{
 			$chunk = $this->getChunk($chunkX, $chunkZ);
 			$chunk->setPopulated(true);
-			$this->changes["$chunkX:$chunkZ"] = $chunk;
+			$this->changes[Level::chunkHash($chunkX, $chunkZ)] = $chunk;
 		}catch(\Exception $e){
 		}
 	}