Fix for bug #2691