Closes #990