closes #2017