Fix for bug 1987