closes #2201