closes #2009