Fixed bug 2334