closes #2639