Fix bug 4657