Closes #1120