closes #2537