Fixed bug 2890