closes #2013