Closes #984