Closes #1625