closes #2071