closes #2412