Closes #1749