Fixed bug 3074