Closes #1014