Closes #953