closes #2177