Fixed bug 2494