Fix bug 5398