Closes #1680