closes #943