closes #2132