Partial fix for bug #64239