closes #2396