Better fix for bug #68446