new try to fix #822 and refs #928,#980