diff --git a/src/Client/World/CMSGConstructor.cpp b/src/Client/World/CMSGConstructor.cpp
index f43ac3c..1dbc974 100644
--- a/src/Client/World/CMSGConstructor.cpp
+++ b/src/Client/World/CMSGConstructor.cpp
@@ -117,7 +117,7 @@ void WorldSession::SendCastSpell(uint32 spellid, bool nocheck)
 
     WorldPacket packet;
     ByteBuffer temp;
-    uint16 flags=TARGET_FLAG_SELF; // target mask. spellcast implementeation needs to be changed if TARGET_MASK_SELF is != 0
+    uint32 flags=TARGET_FLAG_SELF; // target mask. spellcast implementeation needs to be changed if TARGET_MASK_SELF is != 0
     packet << spellid;
     packet << (uint8)0; // unk
     if(target && my->GetTarget() != GetGuid()) // self cast?
diff --git a/src/Client/World/SharedDefines.h b/src/Client/World/SharedDefines.h
index 63d1ee2..2ea48d3 100644
--- a/src/Client/World/SharedDefines.h
+++ b/src/Client/World/SharedDefines.h
@@ -1314,13 +1314,19 @@ enum ChatMsg
 
 enum SpellCastTargetFlags
 {
-    TARGET_FLAG_SELF             = 0x0000,
-    TARGET_FLAG_UNIT             = 0x0002,
-    TARGET_FLAG_OBJECT           = 0x0800,
-    TARGET_FLAG_ITEM             = 0x1010,
-    TARGET_FLAG_SOURCE_LOCATION  = 0x0020,
-    TARGET_FLAG_DEST_LOCATION    = 0x0040,
-    TARGET_FLAG_STRING           = 0x2000
+    TARGET_FLAG_SELF            = 0x00000000,
+    TARGET_FLAG_UNIT            = 0x00000002,               // pguid
+    TARGET_FLAG_ITEM            = 0x00000010,               // pguid
+    TARGET_FLAG_SOURCE_LOCATION = 0x00000020,               // 3 float
+    TARGET_FLAG_DEST_LOCATION   = 0x00000040,               // 3 float
+    TARGET_FLAG_OBJECT_UNK      = 0x00000080,               // ?
+    TARGET_FLAG_PVP_CORPSE      = 0x00000200,               // pguid
+    TARGET_FLAG_OBJECT          = 0x00000800,               // pguid
+    TARGET_FLAG_TRADE_ITEM      = 0x00001000,               // pguid
+    TARGET_FLAG_STRING          = 0x00002000,               // string
+    TARGET_FLAG_UNK1            = 0x00004000,               // ?
+    TARGET_FLAG_CORPSE          = 0x00008000,               // pguid
+    TARGET_FLAG_UNK2            = 0x00010000                // pguid
 };
 
 #define MAX_PLAYERNAME_LENGTH 12