closes #2107