closes #2323