closes #2007