Closes #1617