work on bugs 783499 and 808370