closes #2491