Closes #1071