Closes #1070