Closes #889