closes #2200