Closes #969