Closes #933