closes #2295