Closes #823