diff --git a/src/core/World.js b/src/core/World.js
index 61114e23..9ecd1cd9 100644
--- a/src/core/World.js
+++ b/src/core/World.js
@@ -113,6 +113,8 @@ Phaser.World.prototype.update = function () {
 */
 Phaser.World.prototype.postUpdate = function () {
 
+    this.camera.update();
+
     if (this.game.stage._stage.first._iNext)
     {
         var currentNode = this.game.stage._stage.first._iNext;
@@ -128,8 +130,6 @@ Phaser.World.prototype.postUpdate = function () {
         }
         while (currentNode != this.game.stage._stage.last._iNext)
     }
-
-    this.camera.update();
 }
 
 /**
diff --git a/src/tilemap/TilemapLayer.js b/src/tilemap/TilemapLayer.js
index 5099bcd9..5efcaceb 100644
--- a/src/tilemap/TilemapLayer.js
+++ b/src/tilemap/TilemapLayer.js
@@ -279,13 +279,15 @@ Phaser.TilemapLayer.prototype = Phaser.Utils.extend(true, Phaser.TilemapLayer.pr
 Phaser.TilemapLayer.prototype.constructor = Phaser.TilemapLayer;
 
 /**
-* Automatically called by World.preUpdate. Handles cache updates.
+* Automatically called by World.postUpdate. Handles cache updates.
 *
-* @method Phaser.TilemapLayer#update
+* @method Phaser.TilemapLayer#postUpdate
 * @memberof Phaser.TilemapLayer
 */
-Phaser.TilemapLayer.prototype.update = function () {
+Phaser.TilemapLayer.prototype.postUpdate = function () {
 
+	Phaser.Sprite.prototype.postUpdate.call( this );
+	
     this.scrollX = this.game.camera.x * this.scrollFactorX;
     this.scrollY = this.game.camera.y * this.scrollFactorY;