Fixed bug 957504