closes #1814