closes #939