closes #942