Closes #1078