Fix for bug #2385