Fixed bug 2959