Fix bug 2470