closes #2003