Closes #757