Fixed bug 3104