work on bug 793996