closes #3367