closes #953