closes #2021