Closes #1631