Fixed bug 2646