Fixed bug 2964