work on bugs 808370 and 826388