Closes #1069