closes #2174