Closes #979