closes #2458