Fix bug 2994