Closes #1035