closes #2179