Closes #896