closes #931