Closes #1875