Fixed bug 3261