diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 9a69e199f..323cc2326 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -564,6 +564,12 @@ void Map::Update(const uint32 &t_diff)
 {
     resetMarkedCells();
 
+    MaNGOS::ObjectUpdater updater(t_diff);
+    // for creature
+    TypeContainerVisitor<MaNGOS::ObjectUpdater, GridTypeMapContainer  > grid_object_update(updater);
+    // for pets
+    TypeContainerVisitor<MaNGOS::ObjectUpdater, WorldTypeMapContainer > world_object_update(updater);
+
     //TODO: Player guard
     HashMapHolder<Player>::MapType& playerMap = HashMapHolder<Player>::GetContainer();
     for(HashMapHolder<Player>::MapType::iterator iter = playerMap.begin(); iter != playerMap.end(); ++iter)
@@ -592,33 +598,28 @@ void Map::Update(const uint32 &t_diff)
         end_cell >> 1; end_cell += 1;                   // lower right
 
         for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x)
-            for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y)
-                markCell(x,y);
-    }
-
-    MaNGOS::ObjectUpdater updater(t_diff);
-    // for creature
-    TypeContainerVisitor<MaNGOS::ObjectUpdater, GridTypeMapContainer  > grid_object_update(updater);
-    // for pets
-    TypeContainerVisitor<MaNGOS::ObjectUpdater, WorldTypeMapContainer > world_object_update(updater);
-
-    for(int x = 0; x < TOTAL_NUMBER_OF_CELLS_PER_MAP; ++x)
-    {
-        for(int y = 0; y < TOTAL_NUMBER_OF_CELLS_PER_MAP; ++y)
         {
-            if(isCellMarked(x,y))
+            for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y)
             {
-                CellPair pair(x,y);
-                Cell cell(pair);
-                cell.data.Part.reserved = CENTER_DISTRICT;
-                cell.SetNoCreate();
-                CellLock<NullGuard> cell_lock(cell, pair);
-                cell_lock->Visit(cell_lock, grid_object_update,  *this);
-                cell_lock->Visit(cell_lock, world_object_update, *this);
+                // marked cells are those that have been visited
+                // don't visit the same cell twice
+                uint32 cell_id = (y * TOTAL_NUMBER_OF_CELLS_PER_MAP) + x;
+                if(!isCellMarked(cell_id))
+                {
+                    markCell(cell_id);
+                    CellPair pair(x,y);
+                    Cell cell(pair);
+                    cell.data.Part.reserved = CENTER_DISTRICT;
+                    cell.SetNoCreate();
+                    CellLock<NullGuard> cell_lock(cell, pair);
+                    cell_lock->Visit(cell_lock, grid_object_update,  *this);
+                    cell_lock->Visit(cell_lock, world_object_update, *this);
+                }
             }
         }
     }
 
+
     // Don't unload grids if it's battleground, since we may have manually added GOs,creatures, those doesn't load from DB at grid re-load !
     // This isn't really bother us, since as soon as we have instanced BG-s, the whole map unloads as the BG gets ended
     if (IsBattleGroundOrArena())
diff --git a/src/game/Map.h b/src/game/Map.h
index 1647f3949..333e2e182 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -241,8 +241,9 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj
         void UpdateObjectsVisibilityFor(Player* player, Cell cell, CellPair cellpair);
 
         void resetMarkedCells() { marked_cells.reset(); }
-        bool isCellMarked(uint32 x, uint32 y) { return marked_cells.test(y * TOTAL_NUMBER_OF_CELLS_PER_MAP + x); }
-        void markCell(uint32 x, uint32 y) { marked_cells.set(y * TOTAL_NUMBER_OF_CELLS_PER_MAP + x); }
+        bool isCellMarked(uint32 pCellId) { return marked_cells.test(pCellId); }
+        void markCell(uint32 pCellId) { marked_cells.set(pCellId); }
+
     private:
         void LoadVMap(int pX, int pY);
         void LoadMap(uint32 mapid, uint32 instanceid, int x,int y);
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index b23ad75c8..8344bc0da 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10156,7 +10156,7 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
                 }
                 case SPELL_AURA_OVERRIDE_CLASS_SCRIPTS:
                 {
-                    sLog.outDebug("ProcDamageAndSpell: casting spell id %u (triggered by %s class script aura of spell %u)",
+                    sLog.outDebug("ProcDamageAndSpell: casting spell (triggered by %s class script aura of spell %u)",
                         (isVictim?"a victim's":"an attacker's"),triggeredByAura->GetId());
                     casted = HandleOverrideClassScriptAuraProc(pTarget, triggeredByAura, procSpell,i->cooldown);
                     break;
diff --git a/src/game/World.cpp b/src/game/World.cpp
index ff9d3ebbf..e61193068 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -2451,6 +2451,7 @@ void World::UpdateSessions( time_t diff )
         ///- and remove not active sessions from the list
         if(!itr->second->Update(diff))                      // As interval = 0
         {
+            RemoveQueuedPlayer (itr->second);
             delete itr->second;
             m_sessions.erase(itr);
         }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 264605f9f..6c2212faa 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "6824"
+ #define REVISION_NR "6826"
 #endif // __REVISION_NR_H__