Fix for bug #2386