Fixed bug 923831