closes #2248