closes #2377