work on bugs 874061 and 859756