Fix for bug #2551