Closes #985