work on bugs 808370 and 833877