Fixed bug 997347