closes #917