Closes #1675