closes #3397