Fix for bug #2709