Fixed bug 2700