Fixed bug 958