Closes #1320