Fixed bug 3002