Fix for bug #2468.