Fixed bug 2961