Fixed bug 3004