Fix for bug 2618: