closes #2546