Closes #1659