closes #2022