Fix for bug #2982