closes #2244