After more testing I've checked that current code is bad, but my patch
was also wrong and causes regression in WoW.