Fixed bug 984237