closes #2227