Fixed bug 3032