Fix bug 965490