a bit changes for bugs 793996 and 877262 that i did last week