Closes #1784