Closes #915