closes #2297