closes #2346