closes #3330