Code

Apply fix for Trac #6579