Fixed bug 2965