Closes #1698