Closes #1010