Fix for bug #2967