closes #2053