closes #2532