Fix for bug 2612: