closes #3329