Fix bug 951405