Closes #1681