closes #2195