Re: *RESEND* Fix bug #5800