Fixed bug 2958