Fix bug 2911