bug #81744, #85724
fixes previous bugs uploaded