Closes #741