closes #2530