closes #2219