closes #2556