Closes #1948