r8029: Fix bug 2841. Thanks to Brett Trotter.