closes #2338