Closes #1882