[z2197] Fix and improve last commit

Signed-off-by: Schmoozerd <schmoozerd@cmangos>

(based on commit [12285] - 50c2c0f)

(based on commit [s1831] - d37de7d)