Patch added with improvement in code suggested by Shendor. Signed-off-by: VladimirMangos <vladimir@getmangos.com>