closes #2175