Fixed bug 2630