Fixed bug 2612