Fix for bug #2813