Fixed bug 141