Fixed bug 924