better fix for bug #64770