closes #2196