Code

patch by KoRi for bug 323594