closes #3674