closes #2543