Closes #954