Closes #780