Fix bug 4648