Fix bug 887651