closes #2390