Closes #792