closes #2015