Closes #1637