closes #2100