Fix for bug #2412