diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 5b1c1f9fb..87288fdba 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1203,7 +1203,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 		if(!$this->loggedIn){
 			return false;
 		}
-		
+
 		if($this->dead === true and $this->spawned){
 			++$this->deadTicks;
 			if($this->deadTicks >= 10){
diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index f3c75fd72..3267ab7c1 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -1114,7 +1114,7 @@ abstract class Entity extends Location implements Metadatable{
 				$this->chunk->removeEntity($this);
 			}
 			$this->level->loadChunk($this->x >> 4, $this->z >> 4);
-			$this->chunk = $this->level->getChunk($this->x >> 4, $this->z >> 4);
+			$this->chunk = $this->level->getChunk($this->x >> 4, $this->z >> 4, true);
 			$this->chunkX = $this->chunk->getX();
 			$this->chunkZ = $this->chunk->getZ();