Fix for bug #2892