Fixed bug 935846