Fix for bug #2669