closes #2052