Fix bug 2880