Closes #1802