Closes #978