closes #2018