diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp
index b6124e5d364..73544c9eed1 100644
--- a/src/game/SpellHandler.cpp
+++ b/src/game/SpellHandler.cpp
@@ -518,7 +518,9 @@ void WorldSession::HandleSpellClick( WorldPacket & recv_data )
     uint64 guid;
     recv_data >> guid;
 
-    Creature *unit = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid);
+    // this will get something not in world. crash
+    //Creature *unit = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid);
+    Creature *unit = Unit::GetCreature(*_player, guid);
 
     if(!unit)
         return;