Closes #1691