Fix bug 2879