closes #2133